From 5ee1645db44908f67eee90da9cd0197c60711eae Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 1 Dec 2017 00:55:12 -0800
Subject: Fix tests to successfully run in parallel

---
 .../ProgramFixture.cs                              | 39 +++++++++++++++++-----
 1 file changed, 31 insertions(+), 8 deletions(-)

(limited to 'src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs')

diff --git a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
index 9859c05a..e9e5c62f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
@@ -18,12 +18,20 @@ namespace WixToolsetTest.CoreIntegration
             var folder = TestData.Get(@"TestData\SingleFile");
 
             using (var fs = new DisposableFileSystem())
-            using (var pushd = new Pushd(folder))
             {
                 var intermediateFolder = fs.GetFolder();
 
                 var program = new Program();
-                var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
+                var result = program.Run(new WixToolsetServiceProvider(), new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
+                });
 
                 Assert.Equal(0, result);
 
@@ -35,7 +43,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Single(intermediate.Sections);
 
                 var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single();
-                Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path);
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
                 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
             }
         }
@@ -46,12 +54,19 @@ namespace WixToolsetTest.CoreIntegration
             var folder = TestData.Get(@"TestData\SimpleModule");
 
             using (var fs = new DisposableFileSystem())
-            using (var pushd = new Pushd(folder))
             {
                 var intermediateFolder = fs.GetFolder();
 
                 var program = new Program();
-                var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Module.wxs", "-loc", "Module.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msm" });
+                var result = program.Run(new WixToolsetServiceProvider(), new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Module.wxs"),
+                    "-loc", Path.Combine(folder, "Module.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msm")
+                });
 
                 Assert.Equal(0, result);
 
@@ -62,7 +77,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Single(intermediate.Sections);
 
                 var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single();
-                Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path);
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
                 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
             }
         }
@@ -73,12 +88,20 @@ namespace WixToolsetTest.CoreIntegration
             var folder = TestData.Get(@"TestData\InstanceTransform");
 
             using (var fs = new DisposableFileSystem())
-            using (var pushd = new Pushd(folder))
             {
                 var intermediateFolder = fs.GetFolder();
 
                 var program = new Program();
-                var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
+                var result = program.Run(new WixToolsetServiceProvider(), new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
+                });
 
                 Assert.Equal(0, result);
 
-- 
cgit v1.2.3-55-g6feb