Skip to content

Commit 6947c4f

Browse files
[OTLP] Refactor duplicated assertions
Refactor tests to de-duplicate assertion code.
1 parent 4fe49d6 commit 6947c4f

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/IntegrationTests.cs

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,25 +160,28 @@ public void TraceExportResultIsSuccess(
160160
if (forceFlush)
161161
{
162162
Assert.True(tracerProvider.ForceFlush());
163-
Assert.Single(exportResults);
164-
Assert.Equal(ExportResult.Success, exportResults[0]);
163+
AssertExpectedTraces();
165164
}
166165
else if (exporterOptions.ExportProcessorType == ExportProcessorType.Batch)
167166
{
168167
Assert.True(handle.WaitOne(ExportIntervalMilliseconds * 2));
169-
Assert.Single(exportResults);
170-
Assert.Equal(ExportResult.Success, exportResults[0]);
168+
AssertExpectedTraces();
171169
}
172170
}
173171

174172
if (!forceFlush && exportProcessorType == ExportProcessorType.Simple)
175173
{
176-
Assert.Single(exportResults);
177-
Assert.Equal(ExportResult.Success, exportResults[0]);
174+
AssertExpectedTraces();
178175
}
179176

180177
Assert.Empty(this.openTelemetryEventListener.Errors);
181178
Assert.Empty(this.openTelemetryEventListener.Warnings);
179+
180+
void AssertExpectedTraces()
181+
{
182+
Assert.Single(exportResults);
183+
Assert.Equal(ExportResult.Success, exportResults[0]);
184+
}
182185
}
183186

184187
[Trait("CategoryName", "CollectorIntegrationTests")]
@@ -240,25 +243,28 @@ public void MetricExportResultIsSuccess(
240243
if (forceFlush)
241244
{
242245
Assert.True(meterProvider.ForceFlush());
243-
Assert.Single(exportResults);
244-
Assert.Equal(ExportResult.Success, exportResults[0]);
246+
AssertExpectedMetrics();
245247
}
246248
else if (!useManualExport)
247249
{
248250
Assert.True(handle.WaitOne(ExportIntervalMilliseconds * 2));
249-
Assert.Single(exportResults);
250-
Assert.Equal(ExportResult.Success, exportResults[0]);
251+
AssertExpectedMetrics();
251252
}
252253
}
253254

254255
if (!forceFlush && useManualExport)
255256
{
256-
Assert.Single(exportResults);
257-
Assert.Equal(ExportResult.Success, exportResults[0]);
257+
AssertExpectedMetrics();
258258
}
259259

260260
Assert.Empty(this.openTelemetryEventListener.Errors);
261261
Assert.Empty(this.openTelemetryEventListener.Warnings);
262+
263+
void AssertExpectedMetrics()
264+
{
265+
Assert.Single(exportResults);
266+
Assert.Equal(ExportResult.Success, exportResults[0]);
267+
}
262268
}
263269

264270
[Trait("CategoryName", "CollectorIntegrationTests")]
@@ -319,19 +325,18 @@ public void LogExportResultIsSuccess(
319325
{
320326
case ExportProcessorType.Batch:
321327
Assert.True(handle.WaitOne(ExportIntervalMilliseconds * 2));
322-
Assert.Single(exportResults);
323-
Assert.Equal(ExportResult.Success, exportResults[0]);
324328
break;
325329

326330
case ExportProcessorType.Simple:
327-
Assert.Single(exportResults);
328-
Assert.Equal(ExportResult.Success, exportResults[0]);
329331
break;
330332

331333
default:
332334
throw new NotSupportedException("Unexpected processor type encountered.");
333335
}
334336

337+
Assert.Single(exportResults);
338+
Assert.Equal(ExportResult.Success, exportResults[0]);
339+
335340
Assert.Empty(this.openTelemetryEventListener.Errors);
336341
Assert.Empty(this.openTelemetryEventListener.Warnings);
337342
}

0 commit comments

Comments
 (0)