2 files changed, 46 insertions, 7 deletions

diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
index abf0dbb4..d85db478 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
@@ -13,10 +13,10 @@
     </Package>
 
     <Fragment><util:BroadcastSettingChange />
-        
-        
-    
-            <StandardDirectory Id="ProgramFilesFolder">
+        <util:QueryNativeMachine />
+
+
+        <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
             </StandardDirectory>
         </Fragment>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 2b59b2a9..a9b37870 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -9,6 +9,7 @@ namespace WixToolsetTest.Util
     using WixInternal.Core.TestPackage;
     using WixToolset.Util;
     using Xunit;
+    using System.Xml.Linq;
 
     public class UtilExtensionFixture
     {
@@ -62,9 +63,20 @@ namespace WixToolsetTest.Util
             var output = Path.Combine(folder, "decompile.xml");
 
             build.BuildAndDecompileAndBuild(Build, Decompile, output);
-            File.Exists(output);
-        }
 
+            var doc = XDocument.Load(output);
+            var utilElementNames = doc.Descendants()
+                .Where(e => e.Name.Namespace == "http://wixtoolset.org/schemas/v4/wxs/util")
+                .Select(e => e.Name.LocalName)
+                .OrderBy(s => s)
+                .ToArray();
+            WixAssert.CompareLineByLine(new[]
+            {
+                "FileShare",
+                "FileSharePermission",
+                "User",
+            }, utilElementNames);
+        }
 
         [Fact]
         public void CanBuildCloseApplication()
@@ -225,12 +237,39 @@ namespace WixToolsetTest.Util
                 "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t",
                 "CustomAction:Wix4BroadcastSettingChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastSettingChange\t",
                 "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t",
+                "CustomAction:Wix4QueryNativeMachine_A64\t257\tWix4UtilCA_A64\tWixQueryNativeMachine\t",
                 "CustomAction:Wix4QueryOsDriverInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsDriverInfo\t",
                 "CustomAction:Wix4QueryOsInfo_A64\t257\tWix4UtilCA_A64\tWixQueryOsInfo\t",
             }, results.OrderBy(s => s).ToArray());
         }
 
         [Fact]
+        public void CanBuildAndDecompiileQueries()
+        {
+            var folder = TestData.Get(@"TestData\Queries");
+            var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder });
+            var output = Path.Combine(folder, "decompile.xml");
+
+            build.BuildAndDecompileAndBuild(Build, Decompile, output);
+
+            var doc = XDocument.Load(output);
+            var utilElementNames = doc.Descendants()
+                .Where(e => e.Name.Namespace == "http://wixtoolset.org/schemas/v4/wxs/util")
+                .Select(e => e.Name.LocalName)
+                .OrderBy(s => s)
+                .ToArray();
+            WixAssert.CompareLineByLine(new[]
+            {
+                "BroadcastEnvironmentChange",
+                "BroadcastSettingChange",
+                "CheckRebootRequired",
+                "QueryNativeMachine",
+                "QueryWindowsDriverInfo",
+                "QueryWindowsSuiteInfo",
+            }, utilElementNames);
+        }
+
+        [Fact]
         public void CanBuildWithXmlConfig()
         {
             var folder = TestData.Get(@"TestData", "XmlConfig");