Skip to content

Commit 585ce58

Browse files
vbreussvbreuss
committed
chore: update aweXpect.Testably to v0.8.0
Use new functionality with file content `SameAs` in tests
1 parent 4ac2861 commit 585ce58

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="5.0.0-preview0012"/>
3737
<PackageVersion Include="AutoFixture.Xunit3" Version="5.0.0-preview0012"/>
3838
<PackageVersion Include="aweXpect" Version="1.6.0"/>
39-
<PackageVersion Include="aweXpect.Testably" Version="0.7.0"/>
39+
<PackageVersion Include="aweXpect.Testably" Version="0.8.0"/>
4040
<PackageVersion Include="FluentAssertions" Version="7.2.0"/>
4141
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
4242
<PackageVersion Include="xunit.v3" Version="1.1.0"/>

‎Tests/Testably.Abstractions.Compression.Tests/ZipFile/CreateFromDirectoryTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public async Task CreateFromDirectory_EntryNameEncoding_ShouldUseEncoding(
8282
using IZipArchive archive =
8383
FileSystem.ZipFile().Open("destination.zip", ZipArchiveMode.Read);
8484

85-
var singleEntry = await That(archive.Entries).HasSingle();
85+
IZipArchiveEntry singleEntry = await That(archive.Entries).HasSingle();
8686
if (encodedCorrectly)
8787
{
8888
await That(singleEntry.Name).IsEqualTo(entryName);
@@ -150,9 +150,8 @@ public async Task CreateFromDirectory_ShouldZipDirectoryContent()
150150

151151
FileSystem.ZipFile().ExtractToDirectory("destination.zip", "destination");
152152

153-
await That(FileSystem).HasFile("destination/bar/test.txt");
154-
await That(FileSystem.File.ReadAllBytes("destination/bar/test.txt"))
155-
.IsEqualTo(FileSystem.File.ReadAllBytes("foo/bar/test.txt"));
153+
await That(FileSystem).HasFile("destination/bar/test.txt")
154+
.WithContent().SameAs("foo/bar/test.txt");
156155
}
157156

158157
#if FEATURE_COMPRESSION_STREAM
@@ -204,8 +203,9 @@ await That(archive.Entries).HasSingle()
204203
#if FEATURE_COMPRESSION_STREAM
205204
[Theory]
206205
[AutoData]
207-
public async Task CreateFromDirectory_WithStream_EmptySource_DoNotIncludeBaseDirectory_ShouldBeEmpty(
208-
CompressionLevel compressionLevel)
206+
public async Task
207+
CreateFromDirectory_WithStream_EmptySource_DoNotIncludeBaseDirectory_ShouldBeEmpty(
208+
CompressionLevel compressionLevel)
209209
{
210210
FileSystem.Initialize()
211211
.WithSubdirectory("foo");
@@ -258,7 +258,7 @@ public async Task CreateFromDirectory_WithStream_EntryNameEncoding_ShouldUseEnco
258258

259259
using IZipArchive archive = FileSystem.ZipArchive().New(stream, ZipArchiveMode.Read);
260260

261-
var singleEntry = await That(archive.Entries).HasSingle();
261+
IZipArchiveEntry singleEntry = await That(archive.Entries).HasSingle();
262262
if (encodedCorrectly)
263263
{
264264
await That(singleEntry.Name).IsEqualTo(entryName);
@@ -273,8 +273,9 @@ public async Task CreateFromDirectory_WithStream_EntryNameEncoding_ShouldUseEnco
273273
#if FEATURE_COMPRESSION_STREAM
274274
[Theory]
275275
[AutoData]
276-
public async Task CreateFromDirectory_WithStream_IncludeBaseDirectory_ShouldPrependDirectoryName(
277-
CompressionLevel compressionLevel)
276+
public async Task
277+
CreateFromDirectory_WithStream_IncludeBaseDirectory_ShouldPrependDirectoryName(
278+
CompressionLevel compressionLevel)
278279
{
279280
FileSystem.Initialize()
280281
.WithSubdirectory("foo").Initialized(s => s
@@ -368,9 +369,8 @@ public async Task CreateFromDirectory_WithStream_ShouldZipDirectoryContent()
368369

369370
FileSystem.ZipFile().ExtractToDirectory(stream, "destination");
370371

371-
await That(FileSystem).HasFile("destination/bar/test.txt");
372-
await That(FileSystem.File.ReadAllBytes("destination/bar/test.txt"))
373-
.IsEqualTo(FileSystem.File.ReadAllBytes("foo/bar/test.txt"));
372+
await That(FileSystem).HasFile("destination/bar/test.txt")
373+
.WithContent().SameAs("foo/bar/test.txt");
374374
}
375375
#endif
376376

‎Tests/Testably.Abstractions.Compression.Tests/ZipFile/ExtractToDirectoryTests.cs‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ public async Task ExtractToDirectory_MissingDestinationDirectory_ShouldCreateDir
2121

2222
FileSystem.ZipFile().ExtractToDirectory("destination.zip", "bar");
2323

24-
await That(FileSystem).HasFile("bar/test.txt");
25-
await That(FileSystem.File.ReadAllBytes("bar/test.txt"))
26-
.IsEqualTo(FileSystem.File.ReadAllBytes("foo/test.txt"));
24+
await That(FileSystem).HasFile("bar/test.txt")
25+
.WithContent().SameAs("foo/test.txt");
2726
}
2827

2928
[Fact]
@@ -120,9 +119,8 @@ public async Task ExtractToDirectory_WithEncoding_ShouldZipDirectoryContent(
120119

121120
FileSystem.ZipFile().ExtractToDirectory("destination.zip", "bar", encoding);
122121

123-
await That(FileSystem).HasFile(FileSystem.Path.Combine("bar", "test.txt"));
124-
await That(FileSystem.File.ReadAllBytes(FileSystem.Path.Combine("bar", "test.txt")))
125-
.IsEqualTo(FileSystem.File.ReadAllBytes(FileSystem.Path.Combine("foo", "test.txt")));
122+
await That(FileSystem).HasFile(FileSystem.Path.Combine("bar", "test.txt"))
123+
.WithContent().SameAs(FileSystem.Path.Combine("foo", "test.txt"));
126124
}
127125

128126
[Theory]
@@ -155,7 +153,8 @@ await That(FileSystem.File.ReadAllText(destinationPath))
155153

156154
#if FEATURE_COMPRESSION_STREAM
157155
[Fact]
158-
public async Task ExtractToDirectory_WithStream_MissingDestinationDirectory_ShouldCreateDirectory()
156+
public async Task
157+
ExtractToDirectory_WithStream_MissingDestinationDirectory_ShouldCreateDirectory()
159158
{
160159
FileSystem.Initialize()
161160
.WithSubdirectory("foo").Initialized(s => s
@@ -166,9 +165,8 @@ public async Task ExtractToDirectory_WithStream_MissingDestinationDirectory_Shou
166165

167166
FileSystem.ZipFile().ExtractToDirectory(stream, "bar");
168167

169-
await That(FileSystem).HasFile("bar/test.txt");
170-
await That(FileSystem.File.ReadAllBytes("bar/test.txt"))
171-
.IsEqualTo(FileSystem.File.ReadAllBytes("foo/test.txt"));
168+
await That(FileSystem).HasFile("bar/test.txt")
169+
.WithContent().SameAs("foo/test.txt");
172170
}
173171
#endif
174172

@@ -276,17 +274,17 @@ public async Task ExtractToDirectory_WithStream_WithEncoding_ShouldZipDirectoryC
276274

277275
FileSystem.ZipFile().ExtractToDirectory(stream, "bar", encoding);
278276

279-
await That(FileSystem).HasFile(FileSystem.Path.Combine("bar", "test.txt"));
280-
await That(FileSystem.File.ReadAllBytes(FileSystem.Path.Combine("bar", "test.txt")))
281-
.IsEqualTo(FileSystem.File.ReadAllBytes(FileSystem.Path.Combine("foo", "test.txt")));
277+
await That(FileSystem).HasFile(FileSystem.Path.Combine("bar", "test.txt"))
278+
.WithContent().SameAs(FileSystem.Path.Combine("foo", "test.txt"));
282279
}
283280
#endif
284281

285282
#if FEATURE_COMPRESSION_STREAM
286283
[Theory]
287284
[AutoData]
288-
public async Task ExtractToDirectory_WithStream_WithoutOverwriteAndExistingFile_ShouldOverwriteFile(
289-
string contents)
285+
public async Task
286+
ExtractToDirectory_WithStream_WithoutOverwriteAndExistingFile_ShouldOverwriteFile(
287+
string contents)
290288
{
291289
FileSystem.Initialize()
292290
.WithSubdirectory("bar").Initialized(s => s

0 commit comments

Comments
 (0)