@@ -61,20 +61,10 @@ private MemoryStream Deflate(byte[] data, int level, bool zlib)
6161 return memoryStream ;
6262 }
6363
64- private static byte [ ] GetRandomTestData ( int size )
65- {
66- byte [ ] buffer = new byte [ size ] ;
67- var rnd = new Random ( RandomSeed ) ;
68- rnd . NextBytes ( buffer ) ;
69-
70- return buffer ;
71- }
72-
7364 private void RandomDeflateInflate ( int size , int level , bool zlib )
7465 {
75- byte [ ] buffer = GetRandomTestData ( size ) ;
76-
77- MemoryStream ms = Deflate ( buffer , level , zlib ) ;
66+ var buffer = Utils . GetDummyBytes ( size , RandomSeed ) ;
67+ var ms = Deflate ( buffer , level , zlib ) ;
7868 Inflate ( ms , buffer , level , zlib ) ;
7969 }
8070
@@ -131,9 +121,8 @@ private async Task<MemoryStream> DeflateAsync(byte[] data, int level, bool zlib)
131121
132122 private async Task RandomDeflateInflateAsync ( int size , int level , bool zlib )
133123 {
134- byte [ ] buffer = GetRandomTestData ( size ) ;
135-
136- MemoryStream ms = await DeflateAsync ( buffer , level , zlib ) ;
124+ var buffer = Utils . GetDummyBytes ( size , RandomSeed ) ;
125+ var ms = await DeflateAsync ( buffer , level , zlib ) ;
137126 await InflateAsync ( ms , buffer , level , zlib ) ;
138127 }
139128
@@ -180,58 +169,56 @@ public void InflateDeflateZlib([Range(0, 9)] int level)
180169 [ Category ( "Async" ) ]
181170 public async Task InflateDeflateZlibAsync ( [ Range ( 0 , 9 ) ] int level )
182171 {
183- await RandomDeflateInflateAsync ( 100000 , level , true ) ;
172+ await RandomDeflateInflateAsync ( size : 100000 , level , zlib : true ) ;
184173 }
185174
186175 private delegate void RunCompress ( byte [ ] buffer ) ;
187176
188- private int runLevel ;
189- private bool runZlib ;
190- private long runCount ;
191- private readonly Random runRandom = new Random ( RandomSeed ) ;
177+ private int _runLevel ;
178+ private bool _runZlib ;
192179
193180 private void DeflateAndInflate ( byte [ ] buffer )
194181 {
195- ++ runCount ;
196- MemoryStream ms = Deflate ( buffer , runLevel , runZlib ) ;
197- Inflate ( ms , buffer , runLevel , runZlib ) ;
182+ var ms = Deflate ( buffer , _runLevel , _runZlib ) ;
183+ Inflate ( ms , buffer , _runLevel , _runZlib ) ;
198184 }
199185
200- private void TryVariants ( RunCompress test , byte [ ] buffer , int index )
186+ private void TryVariants ( RunCompress test , byte [ ] buffer , Random random , int index )
201187 {
202188 int worker = 0 ;
203189 while ( worker <= 255 )
204190 {
205191 buffer [ index ] = ( byte ) worker ;
206192 if ( index < buffer . Length - 1 )
207193 {
208- TryVariants ( test , buffer , index + 1 ) ;
194+ TryVariants ( test , buffer , random , index + 1 ) ;
209195 }
210196 else
211197 {
212198 test ( buffer ) ;
213199 }
214200
215- worker += runRandom . Next ( 256 ) ;
201+ worker += random . Next ( maxValue : 256 ) ;
216202 }
217203 }
218204
219205 private void TryManyVariants ( int level , bool zlib , RunCompress test , byte [ ] buffer )
220206 {
221- runLevel = level ;
222- runZlib = zlib ;
223- TryVariants ( test , buffer , 0 ) ;
207+ var random = new Random ( RandomSeed ) ;
208+ _runLevel = level ;
209+ _runZlib = zlib ;
210+ TryVariants ( test , buffer , random , 0 ) ;
224211 }
225212
226213 // TODO: Fix this
227- // [Test]
228- // [Category("Base")]
229- //public void SmallBlocks()
230- //{
231- // byte[] buffer = new byte[10];
232- // Array.Clear( buffer, 0, buffer.Length) ;
233- // TryManyVariants(0, false, new RunCompress( DeflateAndInflate) , buffer);
234- // }
214+ [ Test ]
215+ [ Category ( "Base" ) ]
216+ [ Explicit ( "Long-running" ) ]
217+ public void SmallBlocks ( )
218+ {
219+ var buffer = new byte [ 10 ] ;
220+ TryManyVariants ( level : 0 , zlib : false , DeflateAndInflate , buffer ) ;
221+ }
235222
236223 /// <summary>
237224 /// Basic inflate/deflate test
0 commit comments