@@ -9,8 +9,6 @@ namespace TechnitiumLibrary.UnitTests.TechnitiumLibrary.IO
99 [ TestClass ]
1010 public sealed class PackageTests
1111 {
12- private static MemoryStream CreateWritableStream ( ) => new MemoryStream ( ) ;
13-
1412 private static byte [ ] BuildEmptyPackageFile ( )
1513 {
1614 // Header:
@@ -23,49 +21,14 @@ private static byte[] BuildEmptyPackageFile()
2321 . ToArray ( ) ;
2422 }
2523
26- /// <summary>
27- /// Creates a serialized single PackageItem with name "A" and empty content.
28- /// </summary>
29- private static byte [ ] CreateMinimalItem ( )
30- {
31- using MemoryStream ms = new MemoryStream ( ) ;
32- using BinaryWriter writer = new BinaryWriter ( ms ) ;
33-
34- // Write NAME field (short)
35- writer . Write ( ( byte ) 1 ) ; // length
36- writer . Write ( "A"u8 . ToArray ( ) ) ; // ASCII name
37-
38- // Extract location = 0
39- writer . Write ( ( byte ) 0 ) ;
40-
41- // Flags = 0
42- writer . Write ( ( byte ) 0 ) ;
43-
44- // File size = 0 (Int64)
45- writer . Write ( ( long ) 0 ) ;
46-
47- // Because file size = 0, Write no content
48- return ms . ToArray ( ) ;
49- }
50-
51- private static void WriteItem ( Stream stream )
52- {
53- using MemoryStream data = new MemoryStream ( ) ; // empty payload
54- using PackageItem item = new PackageItem ( "A" , data ) ;
55-
56- item . WriteTo ( stream ) ;
57- }
58-
59-
60-
6124 // -------------------------------------------------------------
6225 // CONSTRUCTION
6326 // -------------------------------------------------------------
6427
6528 [ TestMethod ]
6629 public void Constructor_ShouldWriteHeader_WhenCreating ( )
6730 {
68- using MemoryStream backing = CreateWritableStream ( ) ;
31+ using MemoryStream backing = new MemoryStream ( ) ;
6932
7033 using ( Package pkg = new Package ( backing , PackageMode . Create ) )
7134 {
@@ -119,12 +82,12 @@ public void AddItem_ShouldThrow_WhenNotInCreateMode()
11982 [ TestMethod ]
12083 public void Items_ShouldThrow_WhenNotInOpenMode ( )
12184 {
122- using MemoryStream backing = CreateWritableStream ( ) ;
85+ using MemoryStream backing = new MemoryStream ( ) ;
12386 using Package pkg = new Package ( backing , PackageMode . Create ) ;
12487
12588 Assert . ThrowsExactly < IOException > ( ( ) =>
12689 {
127- System . Collections . ObjectModel . ReadOnlyCollection < PackageItem > _ = pkg . Items ;
90+ _ = pkg . Items ;
12891 } ) ;
12992 }
13093
@@ -135,12 +98,12 @@ public void Items_ShouldThrow_WhenNotInOpenMode()
13598 [ TestMethod ]
13699 public void WriteAndRead_ShouldReturnSameItems ( )
137100 {
138- using MemoryStream backing = CreateWritableStream ( ) ;
101+ using MemoryStream backing = new MemoryStream ( ) ;
139102
140103 // Write
141104 using ( Package pkg = new Package ( backing , PackageMode . Create ) )
142105 {
143- WriteItem ( backing ) ;
106+ pkg . AddItem ( new PackageItem ( "A" , Stream . Null ) ) ;
144107 pkg . Close ( ) ;
145108 }
146109
@@ -154,9 +117,9 @@ public void WriteAndRead_ShouldReturnSameItems()
154117 [ TestMethod ]
155118 public void Close_ShouldWriteEOF_Once ( )
156119 {
157- using MemoryStream backing = CreateWritableStream ( ) ;
120+ using MemoryStream backing = new MemoryStream ( ) ;
158121 using Package pkg = new Package ( backing , PackageMode . Create ) ;
159- WriteItem ( backing ) ;
122+ pkg . AddItem ( new PackageItem ( "A" , Stream . Null ) ) ;
160123 pkg . Close ( ) ;
161124 long len1 = backing . Length ;
162125 pkg . Close ( ) ;
@@ -202,7 +165,7 @@ public void Dispose_ShouldCloseOwnedStream()
202165 [ TestMethod ]
203166 public void Dispose_ShouldNotCloseExternalStream ( )
204167 {
205- using MemoryStream backing = CreateWritableStream ( ) ;
168+ using MemoryStream backing = new MemoryStream ( ) ;
206169 using ( Package pkg = new Package ( backing , PackageMode . Create , ownsStream : false ) )
207170 pkg . Close ( ) ;
208171
0 commit comments