@@ -166,6 +166,8 @@ public async Task ExportTest(bool warmup)
166166 {
167167 pool . Return ( new LogRecord { Source = LogRecord . LogRecordSource . FromSharedPool , PoolReferenceCount = 1 } ) ;
168168 }
169+
170+ Assert . Equal ( LogRecordSharedPool . DefaultMaxPoolSize , pool . Count ) ;
169171 }
170172
171173#pragma warning disable CA2000 // Dispose objects before losing scope
@@ -178,7 +180,12 @@ public async Task ExportTest(bool warmup)
178180 {
179181 tasks . Add ( Task . Run ( async ( ) =>
180182 {
181- Random random = new Random ( ) ;
183+ var random =
184+ #if NET
185+ Random . Shared ;
186+ #else
187+ new Random ( ) ;
188+ #endif
182189
183190#pragma warning disable CA5394 // Do not use insecure randomness
184191 await Task. Delay ( random . Next ( 100 , 150 ) ) ;
@@ -202,14 +209,10 @@ public async Task ExportTest(bool warmup)
202209
203210 await Task . WhenAll ( tasks ) ;
204211
205- processor . ForceFlush ( ) ;
212+ Assert . True ( processor . ForceFlush ( ) ) ;
206213
207- if ( warmup )
208- {
209- Assert . Equal ( LogRecordSharedPool . DefaultMaxPoolSize , pool . Count ) ;
210- }
211-
212- Assert . True ( pool . Count <= LogRecordSharedPool . DefaultMaxPoolSize ) ;
214+ Assert . NotEqual ( 0 , pool . Count ) ;
215+ Assert . True ( pool . Count <= LogRecordSharedPool . DefaultMaxPoolSize , $ "{ pool . Count } > { LogRecordSharedPool . DefaultMaxPoolSize } ") ;
213216 }
214217
215218 [ Fact ]
@@ -242,7 +245,7 @@ public async Task DeadlockTest()
242245 {
243246 tasks . Add ( Task . Run ( async ( ) =>
244247 {
245- await Task . Delay ( 2000 ) ;
248+ await Task . Delay ( 2_000 ) ;
246249
247250 for ( int i = 0 ; i < 100_000 ; i ++ )
248251 {
@@ -255,14 +258,11 @@ public async Task DeadlockTest()
255258
256259 await Task . WhenAll ( tasks ) ;
257260
258- Assert . True ( pool . Count <= LogRecordSharedPool . DefaultMaxPoolSize ) ;
261+ Assert . True ( pool . Count <= LogRecordSharedPool . DefaultMaxPoolSize , $ " { pool . Count } > { LogRecordSharedPool . DefaultMaxPoolSize } " ) ;
259262 }
260263
261264 private sealed class NoopExporter : BaseExporter < LogRecord >
262265 {
263- public override ExportResult Export ( in Batch < LogRecord > batch )
264- {
265- return ExportResult . Success ;
266- }
266+ public override ExportResult Export ( in Batch < LogRecord > batch ) => ExportResult . Success ;
267267 }
268268}
0 commit comments