Skip to content

Commit c52a9a7

Browse files
authored
[chore] Use assert/assert instead of require/assert (#35182)
1 parent 616d91a commit c52a9a7

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

receiver/windowseventlogreceiver/receiver_windows_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ func TestReadWindowsEventLogger(t *testing.T) {
152152
err = logger.Info(10, logMessage)
153153
require.NoError(t, err)
154154

155-
records := requireExpectedLogRecords(t, sink, src, 1)
155+
records := assertExpectedLogRecords(t, sink, src, 1)
156+
require.Len(t, records, 1)
156157
record := records[0]
157158
body := record.Body().Map().AsRaw()
158159

@@ -205,7 +206,8 @@ func TestReadWindowsEventLoggerRaw(t *testing.T) {
205206
err = logger.Info(10, logMessage)
206207
require.NoError(t, err)
207208

208-
records := requireExpectedLogRecords(t, sink, src, 1)
209+
records := assertExpectedLogRecords(t, sink, src, 1)
210+
require.Len(t, records, 1)
209211
record := records[0]
210212
body := record.Body().AsString()
211213
bodyStruct := struct {
@@ -272,8 +274,8 @@ func TestExcludeProvider(t *testing.T) {
272274
require.NoError(t, err)
273275
}
274276

275-
records := requireExpectedLogRecords(t, sink, notExcludedSrc, 1)
276-
assert.NotEmpty(t, records)
277+
records := assertExpectedLogRecords(t, sink, notExcludedSrc, 1)
278+
assert.Len(t, records, 1)
277279

278280
records = filterAllLogRecordsBySource(t, sink, excludedSrc)
279281
assert.Empty(t, records)
@@ -319,13 +321,13 @@ func assertEventSourceInstallation(t *testing.T, src string) (uninstallEventSour
319321
return
320322
}
321323

322-
func requireExpectedLogRecords(t *testing.T, sink *consumertest.LogsSink, expectedEventSrc string, expectedEventCount int) []plog.LogRecord {
324+
func assertExpectedLogRecords(t *testing.T, sink *consumertest.LogsSink, expectedEventSrc string, expectedEventCount int) []plog.LogRecord {
323325
var actualLogRecords []plog.LogRecord
324326

325327
// logs sometimes take a while to be written, so a substantial wait buffer is needed
326-
require.EventuallyWithT(t, func(c *assert.CollectT) {
328+
assert.EventuallyWithT(t, func(c *assert.CollectT) {
327329
actualLogRecords = filterAllLogRecordsBySource(t, sink, expectedEventSrc)
328-
require.Len(c, actualLogRecords, expectedEventCount)
330+
assert.Len(c, actualLogRecords, expectedEventCount)
329331
}, 10*time.Second, 250*time.Millisecond)
330332

331333
return actualLogRecords

0 commit comments

Comments
 (0)