Skip to content

Commit e1cb1df

Browse files
committed
updated test
1 parent 097b652 commit e1cb1df

1 file changed

Lines changed: 9 additions & 16 deletions

File tree

exporter/exporterhelper/internal/queuebatch/config_test.go

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,41 @@ import (
1919
)
2020

2121
func TestConfig_Validate(t *testing.T) {
22-
cfg := newTestConfigWithSizers()
22+
cfg := newTestConfig()
2323
require.NoError(t, xconfmap.Validate(cfg))
2424

2525
cfg.NumConsumers = 0
2626
require.EqualError(t, xconfmap.Validate(cfg), "`num_consumers` must be positive")
2727

28-
cfg = newTestConfigWithSizers()
28+
cfg = newTestConfig()
2929
cfg.QueueSize = 0
3030
require.EqualError(t, xconfmap.Validate(cfg), "`queue_size` must be positive")
3131

32-
cfg = newTestConfigWithSizers()
32+
cfg = newTestConfig()
3333
cfg.QueueSize = 0
3434
require.EqualError(t, xconfmap.Validate(cfg), "`queue_size` must be positive")
3535

3636
storageID := component.MustNewID("test")
37-
cfg = newTestConfigWithSizers()
37+
cfg = newTestConfig()
3838
cfg.WaitForResult = true
3939
cfg.StorageID = &storageID
4040
require.EqualError(t, xconfmap.Validate(cfg), "`wait_for_result` is not supported with a persistent queue configured with `storage`")
4141

42-
cfg = newTestConfigWithSizers()
42+
cfg = newTestConfig()
4343
cfg.QueueSize = cfg.Batch.Get().Sizers[request.SizerTypeItems].MinSize - 1
4444
require.EqualError(t, xconfmap.Validate(cfg), "for sizer items, `min_size` (2048) must be less than or equal to `queue_size` (2047)")
4545

46-
cfg = newTestConfigWithSizers()
46+
cfg = newTestConfig()
4747
cfg.Batch.Get().Sizers = map[request.SizerType]SizerLimit{}
4848
cfg.Batch.Get().Sizer = request.SizerType{}
4949
require.EqualError(t, xconfmap.Validate(cfg), "batch: `sizers` cannot be empty; leave it unset to use default batch settings, or configure at least one sizer limit")
5050

51-
cfg = newTestConfigWithSizers()
51+
cfg = newTestConfig()
5252
cfg.Sizer = request.SizerTypeBytes
5353
require.NoError(t, xconfmap.Validate(cfg))
5454

5555
// Programmatic legacy usage -> error
56-
cfg = newTestConfigWithSizers()
56+
cfg = newTestConfig()
5757
cfg.Batch.Get().Sizer = request.SizerTypeItems
5858
require.EqualError(t, xconfmap.Validate(cfg), "batch: `batch` does not support `min_size`, `max_size`, `sizer` fields anymore, please use `sizers` instead")
5959
}
@@ -160,14 +160,7 @@ func newTestBatchConfig() BatchConfig {
160160
}
161161
}
162162

163-
func newTestConfigWithSizers() Config {
164-
return Config{
165-
Sizer: request.SizerTypeItems,
166-
NumConsumers: 10,
167-
QueueSize: 100_000,
168-
Batch: configoptional.Some(newTestBatchConfig()),
169-
}
170-
}
163+
171164

172165
func TestUnmarshal(t *testing.T) {
173166
newBaseCfg := func() configoptional.Optional[Config] {

0 commit comments

Comments
 (0)