From 4d27a43eb676e48a6ae6213e234f519b6af8c8a7 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 19 Mar 2021 12:10:19 -0700
Subject: Minor test clean up

---
 .../TestData/InternetShortcutModule/Module.wxs            | 15 +++++++++++++++
 .../TestData/InternetShortcutModule/ModuleComponents.wxs  | 11 +++++++++++
 .../TestData/InternetShortcutModule/Package.en-us.wxl     | 11 -----------
 .../TestData/InternetShortcutModule/Package.wxs           | 15 ---------------
 .../TestData/InternetShortcutModule/PackageComponents.wxs | 11 -----------
 src/test/WixToolsetTest.Util/UtilExtensionFixture.cs      |  2 +-
 6 files changed, 27 insertions(+), 38 deletions(-)
 create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
 create mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs

diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
new file mode 100644
index 00000000..2a9daa1c
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
+        <SummaryInformation Manufacturer="Example Corporation" />
+
+        <ComponentGroupRef Id="ProductComponents" />
+    </Module>
+
+    <Fragment>
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="MergeModule" />
+            </Directory>
+        </Directory>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
new file mode 100644
index 00000000..2a1b4347
--- /dev/null
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+            <Component>
+                <File Id="Package.ico" Source="Package.ico" />
+                <util:InternetShortcut Type="link" Name="WiX Toolset (link)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
+                <util:InternetShortcut Type="url" Name="WiX Toolset (url)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
deleted file mode 100644
index 2a9daa1c..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
-        <SummaryInformation Manufacturer="Example Corporation" />
-
-        <ComponentGroupRef Id="ProductComponents" />
-    </Module>
-
-    <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MergeModule" />
-            </Directory>
-        </Directory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs
deleted file mode 100644
index 2a1b4347..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Id="Package.ico" Source="Package.ico" />
-                <util:InternetShortcut Type="link" Name="WiX Toolset (link)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
-                <util:InternetShortcut Type="url" Name="WiX Toolset (url)" Target="https://wixtoolset.org" IconFile="[#Package.ico]" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 3e2a97f9..b2af91b3 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -96,7 +96,7 @@ namespace WixToolsetTest.Util
         public void CanBuildInternetShortcutInMergeModule()
         {
             var folder = TestData.Get(@"TestData\InternetShortcutModule");
-            var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder });
+            var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm");
 
             var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut");
             WixAssert.CompareLineByLine(new[]
-- 
cgit v1.2.3-55-g6feb