Skip to content

Commit d2a4435

Browse files
authored
Update baseline test (dotnet#8014)
1 parent f8c3f02 commit d2a4435

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

test/SharedFx.UnitTests/SharedFxTests.cs

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,45 @@ public async Task BaselineTest(SharedFxConfig config)
3636
}
3737

3838
var zipPath = Path.Combine(AppContext.BaseDirectory, zipName);
39+
var tempDirectoryPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
3940

40-
if (!Directory.Exists(AppContext.BaseDirectory + "unzipped"))
41+
try
4142
{
42-
ZipFile.ExtractToDirectory(AppContext.BaseDirectory, "unzipped");
43-
}
44-
45-
var nugetAssembliesPath = Path.Combine(AppContext.BaseDirectory, "unzipped", "shared", config.Name, previousVersion);
43+
Directory.CreateDirectory(tempDirectoryPath);
44+
ZipFile.ExtractToDirectory(zipPath, tempDirectoryPath);
45+
var nugetAssembliesPath = Path.Combine(tempDirectoryPath, "shared", config.Name, previousVersion);
4646

47-
var files = Directory.GetFiles(nugetAssembliesPath, "*.dll");
48-
foreach (var file in files)
49-
{
50-
try
47+
var files = Directory.GetFiles(nugetAssembliesPath, "*.dll");
48+
foreach (var file in files)
5149
{
52-
var assemblyVersion = AssemblyName.GetAssemblyName(file).Version;
53-
var dllName = Path.GetFileName(file);
54-
nugetAssemblyVersions.Add(dllName, assemblyVersion);
50+
try
51+
{
52+
var assemblyVersion = AssemblyName.GetAssemblyName(file).Version;
53+
var dllName = Path.GetFileName(file);
54+
nugetAssemblyVersions.Add(dllName, assemblyVersion);
55+
}
56+
catch (BadImageFormatException) { }
5557
}
56-
catch (BadImageFormatException) { }
57-
}
5858

59-
files = Directory.GetFiles(dir, "*.dll");
59+
files = Directory.GetFiles(dir, "*.dll");
6060

61-
Assert.All(files, file =>
62-
{
63-
try
61+
Assert.All(files, file =>
6462
{
65-
var localAssemblyVersion = AssemblyName.GetAssemblyName(file).Version;
66-
var dllName = Path.GetFileName(file);
67-
Assert.True(nugetAssemblyVersions.ContainsKey(dllName), $"Expected {dllName} to be in the downloaded dlls");
68-
Assert.True(localAssemblyVersion.CompareTo(nugetAssemblyVersions[dllName]) >= 0, $"Expected the local version of {dllName} to be greater than or equal to the already released version.");
69-
}
70-
catch (BadImageFormatException) { }
63+
try
64+
{
65+
var localAssemblyVersion = AssemblyName.GetAssemblyName(file).Version;
66+
var dllName = Path.GetFileName(file);
67+
Assert.Contains(dllName, nugetAssemblyVersions.Keys);
68+
Assert.InRange(localAssemblyVersion.CompareTo(nugetAssemblyVersions[dllName]), 0, int.MaxValue);
69+
}
70+
catch (BadImageFormatException) { }
7171

72-
});
72+
});
73+
}
74+
finally
75+
{
76+
Directory.Delete(tempDirectoryPath, true);
77+
}
7378
}
7479

7580
[Theory]

0 commit comments

Comments
 (0)