Fix source path and cabinet processing

1 files changed, 47 insertions, 0 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
index 4b4daeda..da9f3a38 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
@@ -39,5 +39,52 @@ namespace WixToolsetTest.CoreIntegrationFixture
                 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
             }
         }
+
+        [Fact]
+        public void CanBuildSimpleModule()
+        {
+            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" });
+
+                Assert.Equal(0, result);
+
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
+
+                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir"));
+                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(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+            }
+        }
+
+        [Fact(Skip = "Not implemented yet.")]
+        public void CanBuildInstanceTransform()
+        {
+            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" });
+
+                Assert.Equal(0, result);
+
+                var pdb = Pdb.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"), false);
+                Assert.NotEmpty(pdb.Output.SubStorages);
+            }
+        }
     }
 }