Fix TryGetNextNonSwitchArgumentOrError.

2 files changed, 44 insertions, 29 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
index 02422cf7..874151e4 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
@@ -6,11 +6,55 @@ namespace WixToolsetTest.CoreIntegration
     using System.IO;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
+    using WixToolset.Data;
     using Xunit;
 
     public class BadInputFixture
     {
         [Fact]
+        public void SwitchIsNotConsideredAnArgument()
+        {
+            var result = WixRunner.Execute(new[]
+            {
+                "build",
+                "-bindpath", "-thisisaswitchnotanarg",
+            });
+
+            Assert.Single(result.Messages, m => m.Id == (int)ErrorMessages.Ids.ExpectedArgument);
+            // TODO: when CantBuildSingleExeBundleWithInvalidArgument is fixed, uncomment:
+            //Assert.Equal((int)ErrorMessages.Ids.ExpectedArgument, result.ExitCode);
+        }
+
+        [Fact(Skip = "Test demonstrates failure")]
+        public void CantBuildSingleExeBundleWithInvalidArgument()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "SingleExeBundle", "SingleExePackageGroup.wxs"),
+                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-bindpath", Path.Combine(folder, ".Data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", exePath,
+                    "-nonexistentswitch", "param",
+                });
+
+                Assert.NotEqual(0, result.ExitCode);
+
+                Assert.False(File.Exists(exePath));
+            }
+        }
+
+        [Fact]
         public void RegistryKeyWithoutAttributesDoesntCrash()
         {
             var folder = TestData.Get(@"TestData\BadInput");
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 1e3f1e24..fae2ff4c 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -189,35 +189,6 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
-        public void CantBuildSingleExeBundleWithInvalidArgument()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SingleExeBundle", "SingleExePackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                    "-nonexistentswitch", "param",
-                });
-
-                Assert.NotEqual(0, result.ExitCode);
-
-                Assert.False(File.Exists(exePath));
-            }
-        }
-
         [Fact]
         public void CanBuildSingleExeRemotePayloadBundle()
         {