Skip to content

Commit 24384b1

Browse files
saibulususaibulusu
andauthored
Win32NT unit tests fix (#457)
* Trying Path.Combine. * Using Path.Combine for more tests. * Using Path.Combine for more unit tests. * Debugging. * Checking Path.Combine string. * Trying checking for OS. * Trying operatingsytem.iswindows. * Fixing small issue. * fixing small mistake. * Fixing small mistake. * Overloading standardize path. * Using this.mockFixture.Combine. * useUnixStylePathsOnly should be required in overloaded method. * reverting --------- Co-authored-by: saibulusu <[email protected]>
1 parent 87ee2aa commit 24384b1

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSClientExecutorTests2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private void SetupTest(PlatformID platformID, Architecture architecture)
5656
this.mockFixture.Parameters["Delaytime"] = 30;
5757
this.mockFixture.Parameters["ConfidenceLevel"] = "99";
5858

59-
string exampleResults = File.ReadAllText(this.mockFixture.Combine(CPSClientExecutorTests2.ExamplesDirectory, "CPS_Example_Results_Server.txt"));
59+
string exampleResults = File.ReadAllText(Path.Combine(CPSClientExecutorTests2.ExamplesDirectory, "CPS_Example_Results_Server.txt"));
6060

6161
this.mockFixture.Process.StandardOutput.Append(exampleResults);
6262

src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSServerExecutorTests2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture)
5555
this.mockFixture.Parameters["Scenario"] = "CPSMock";
5656
this.mockFixture.Parameters["ConfidenceLevel"] = "99";
5757

58-
string exampleResults = File.ReadAllText(this.mockFixture.Combine(CPSServerExecutorTests2.ExamplesDirectory, "CPS_Example_Results_Server.txt"));
58+
string exampleResults = File.ReadAllText(Path.Combine(CPSServerExecutorTests2.ExamplesDirectory, "CPS_Example_Results_Server.txt"));
5959

6060
this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
6161
.ReturnsAsync(exampleResults);

src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteClientExecutorTests2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture)
4545
this.mockFixture.Parameters["WarmupTime"] = 300;
4646
this.mockFixture.Parameters["Protocol"] = "Tcp";
4747

48-
string exampleResults = File.ReadAllText(this.mockFixture.Combine(LatteClientExecutorTests2.ExamplesDirectory, "Latte_Results_Example.txt"));
48+
string exampleResults = File.ReadAllText(Path.Combine(LatteClientExecutorTests2.ExamplesDirectory, "Latte_Results_Example.txt"));
4949

5050
LatteWorkloadState executionStartedState = new LatteWorkloadState(ClientServerStatus.ExecutionStarted);
5151
Item<LatteWorkloadState> expectedStateItem = new Item<LatteWorkloadState>(nameof(LatteWorkloadState), executionStartedState);

src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteServerExecutorTests2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture)
4343
this.mockFixture.Parameters["Workload"] = "CPS";
4444
this.mockFixture.Parameters["Scenario"] = "LatteMock";
4545

46-
string exampleResults = File.ReadAllText(this.mockFixture.Combine(LatteServerExecutorTests2.ExamplesDirectory, "Latte_Results_Example.txt"));
46+
string exampleResults = File.ReadAllText(Path.Combine(LatteServerExecutorTests2.ExamplesDirectory, "Latte_Results_Example.txt"));
4747

4848
this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
4949
.ReturnsAsync(exampleResults);

src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpClientExecutorTests2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture)
5252
this.mockFixture.Parameters["ConnectionsPerThread"] = 2;
5353
this.mockFixture.Parameters["DevInterruptsDifferentiator"] = "mlx";
5454

55-
string exampleResults = File.ReadAllText(this.mockFixture.Combine(NTttcpClientExecutorTests2.ExamplesDirectory, "ClientOutput.xml"));
55+
string exampleResults = File.ReadAllText(Path.Combine(NTttcpClientExecutorTests2.ExamplesDirectory, "ClientOutput.xml"));
5656

5757
NTttcpWorkloadState executionStartedState = new NTttcpWorkloadState(ClientServerStatus.ExecutionStarted);
5858
Item<NTttcpWorkloadState> expectedStateItem = new Item<NTttcpWorkloadState>(nameof(NTttcpWorkloadState), executionStartedState);

src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpServerExecutorTests2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture)
4747
this.mockFixture.Parameters["Workload"] = "CPS";
4848
this.mockFixture.Parameters["Scenario"] = "NTttcpMock";
4949

50-
string exampleResults = File.ReadAllText(this.mockFixture.Combine(NTttcpServerExecutorTests2.ExamplesDirectory, "ClientOutput.xml"));
50+
string exampleResults = File.ReadAllText(Path.Combine(NTttcpServerExecutorTests2.ExamplesDirectory, "ClientOutput.xml"));
5151

5252
this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
5353
.ReturnsAsync(exampleResults);

src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95ExecutorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void SetupTest(PlatformID platform)
3131
this.mockPackage = new DependencyPath("prime95", this.mockFixture.GetPackagePath("prime95"));
3232
this.mockFixture.SetupPackage(this.mockPackage);
3333

34-
this.exampleResults = File.ReadAllText(this.mockFixture.Combine(Prime95ExecutorTests.ExamplesDirectory, "prime95_results_example_pass.txt"));
34+
this.exampleResults = File.ReadAllText(Path.Combine(Prime95ExecutorTests.ExamplesDirectory, "prime95_results_example_pass.txt"));
3535

3636
this.mockFixture.File.Reset();
3737
this.mockFixture.File.Setup(fe => fe.Exists(It.IsAny<string>()))

src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PowershellExecutorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void SetupTest(PlatformID platform = PlatformID.Win32NT)
3434

3535
this.fixture.Dependencies.RemoveAll<IEnumerable<IBlobManager>>();
3636

37-
this.exampleResults = File.ReadAllText(this.fixture.Combine(PowershellExecutorTests.ExamplesDirectory, "validJsonExample.json"));
37+
this.exampleResults = File.ReadAllText(Path.Combine(PowershellExecutorTests.ExamplesDirectory, "validJsonExample.json"));
3838

3939
this.fixture.File.Reset();
4040
this.fixture.File.Setup(fe => fe.Exists(It.IsAny<string>()))

src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/ScriptExecutorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void SetupTest(PlatformID platform)
3535
this.mockPackage = new DependencyPath("workloadPackage", this.mockFixture.GetPackagePath("workloadPackage"));
3636
this.mockFixture.SetupPackage(this.mockPackage);
3737

38-
this.exampleResults = File.ReadAllText(this.mockFixture.Combine(ScriptExecutorTests.ExamplesDirectory, "validJsonExample.json"));
38+
this.exampleResults = File.ReadAllText(Path.Combine(ScriptExecutorTests.ExamplesDirectory, "validJsonExample.json"));
3939

4040
this.mockFixture.File.Reset();
4141
this.mockFixture.File.Setup(fe => fe.Exists(It.IsAny<string>()))

0 commit comments

Comments
 (0)