1 files changed, 99 insertions, 12 deletions

diff --git a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
index 388d4dc0..d517e209 100644
--- a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
+++ b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
@@ -30,7 +30,6 @@ namespace WixToolsetTest.Heat
                 var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    "<?xml version='1.0' encoding='utf-8'?>",
                     "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                     "    <Fragment>",
                     "        <StandardDirectory Id='TARGETDIR'>",
@@ -50,7 +49,7 @@ namespace WixToolsetTest.Heat
         }
 
         [Fact]
-        public void CanHarvestSimpleDirectoryToInstallFolder()
+        public void CanHarvestSimpleDirectoryToComponentGroup()
         {
             var folder = TestData.Get("TestData", "SingleFile");
 
@@ -61,7 +60,7 @@ namespace WixToolsetTest.Heat
                 var args = new[]
                 {
                     "dir", folder,
-                    "-dr", "INSTALLFOLDER",
+                    "-cg", "CG1",
                     "-o", outputPath
                 };
 
@@ -71,19 +70,18 @@ namespace WixToolsetTest.Heat
                 var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    "<?xml version='1.0' encoding='utf-8'?>",
                     "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                     "    <Fragment>",
-                    "        <DirectoryRef Id='INSTALLFOLDER'>",
-                    "            <Directory Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE' Name='SingleFile' />",
-                    "        </DirectoryRef>",
+                    "        <StandardDirectory Id='TARGETDIR'>",
+                    "            <Directory Id='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8' Name='SingleFile' />",
+                    "        </StandardDirectory>",
                     "    </Fragment>",
                     "    <Fragment>",
-                    "        <DirectoryRef Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE'>",
-                    "            <Component Id='cmpxHVF6oXohc0EWgRphmYZvw5.GGU' Guid='PUT-GUID-HERE'>",
-                    "                <File Id='filk_7KUAfL4VfzxSRsGFf_XOBHln0' KeyPath='yes' Source='SourceDir\\a.txt' />",
+                    "        <ComponentGroup Id='CG1'>",
+                    "            <Component Id='cmp0i3dThrp4nheCteEmXvHxBDa_VE' Directory='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8' Guid='PUT-GUID-HERE'>",
+                    "                <File Id='filziMcXYgrmcbVF8PuTUfIB9Vgqo0' KeyPath='yes' Source='SourceDir\\a.txt' />",
                     "            </Component>",
-                    "        </DirectoryRef>",
+                    "        </ComponentGroup>",
                     "    </Fragment>",
                     "</Wix>",
                 }, wxs);
@@ -91,6 +89,47 @@ namespace WixToolsetTest.Heat
         }
 
         [Fact]
+        public void CanHarvestSimpleDirectoryToInstallFolder()
+        {
+            var folder = TestData.Get("TestData", "SingleFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var outputPath = Path.Combine(fs.GetFolder(), "out.wxs");
+
+                var args = new[]
+                {
+                    "dir", folder,
+                    "-dr", "INSTALLFOLDER",
+                    "-indent", "2",
+                    "-o", outputPath
+                };
+
+                var result = HeatRunner.Execute(args);
+                result.AssertSuccess();
+
+                var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                    "  <Fragment>",
+                    "    <DirectoryRef Id='INSTALLFOLDER'>",
+                    "      <Directory Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE' Name='SingleFile' />",
+                    "    </DirectoryRef>",
+                    "  </Fragment>",
+                    "  <Fragment>",
+                    "    <DirectoryRef Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE'>",
+                    "      <Component Id='cmpxHVF6oXohc0EWgRphmYZvw5.GGU' Guid='PUT-GUID-HERE'>",
+                    "        <File Id='filk_7KUAfL4VfzxSRsGFf_XOBHln0' KeyPath='yes' Source='SourceDir\\a.txt' />",
+                    "      </Component>",
+                    "    </DirectoryRef>",
+                    "  </Fragment>",
+                    "</Wix>",
+                }, wxs);
+            }
+        }
+
+        [Fact]
         public void CanHarvestFile()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -114,7 +153,6 @@ namespace WixToolsetTest.Heat
                 var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    "<?xml version='1.0' encoding='utf-8'?>",
                     "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                     "    <Fragment>",
                     "        <StandardDirectory Id='ProgramFiles6432Folder'>",
@@ -132,5 +170,54 @@ namespace WixToolsetTest.Heat
                 }, wxs);
             }
         }
+
+        [Fact]
+        public void CanHarvestRegistry()
+        {
+            var folder = TestData.Get("TestData", "RegFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var outputPath = Path.Combine(fs.GetFolder(), "out.wxs");
+
+                var args = new[]
+                {
+                    "reg", Path.Combine(folder, "input.reg"),
+                    "-o", outputPath
+                };
+
+                var result = HeatRunner.Execute(args);
+                result.AssertSuccess();
+
+                var actual = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
+                var expected = File.ReadAllLines(Path.Combine(folder, "Expected.wxs")).Select(s => s.Replace("\"", "'")).ToArray();
+                WixAssert.CompareLineByLine(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void CanHarvestRegistryIntoComponentGroup()
+        {
+            var folder = TestData.Get("TestData", "RegFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var outputPath = Path.Combine(fs.GetFolder(), "out.wxs");
+
+                var args = new[]
+                {
+                    "reg", Path.Combine(folder, "input.reg"),
+                    "-cg", "CG1",
+                    "-o", outputPath
+                };
+
+                var result = HeatRunner.Execute(args);
+                result.AssertSuccess();
+
+                var actual = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
+                var expected = File.ReadAllLines(Path.Combine(folder, "ExpectedWithComponentGroup.wxs")).Select(s => s.Replace("\"", "'")).ToArray();
+                WixAssert.CompareLineByLine(expected, actual);
+            }
+        }
     }
 }