From 0eec58b87b3aeb73758f8bb581244e291631d767 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 26 Jun 2020 13:52:38 -0700
Subject: Skip v3 conversions when re-converting v4 code

Rename Wix3Converter to WixConverter as the class is used for all
conversions.
---
 .../WixToolsetTest.Converters/ConditionFixture.cs  | 10 ++++----
 .../WixToolsetTest.Converters/ConverterFixture.cs  | 28 +++++++++++-----------
 .../ConverterIntegrationFixture.cs                 |  6 ++---
 .../CustomActionFixture.cs                         |  4 ++--
 .../CustomTableFixture.cs                          | 10 ++++----
 .../WixToolsetTest.Converters/PropertyFixture.cs   |  6 ++---
 .../WixToolsetTest.Converters/SequenceFixture.cs   |  2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/test')

diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
index 804ebe5b..3fa7c031 100644
--- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -45,7 +45,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -81,7 +81,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -117,7 +117,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -151,7 +151,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -192,7 +192,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
index 10029090..c205df39 100644
--- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -29,7 +29,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -62,7 +62,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 4, null, null);
+            var converter = new WixConverter(messaging, 4, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -97,7 +97,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 4, null, null);
+            var converter = new WixConverter(messaging, 4, null, null);
 
             var conversions = converter.ConvertDocument(document);
 
@@ -133,7 +133,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 4, null, null);
+            var converter = new WixConverter(messaging, 4, null, null);
 
             var conversions = converter.ConvertDocument(document);
 
@@ -160,7 +160,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -188,7 +188,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -220,7 +220,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -249,7 +249,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -277,7 +277,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -315,7 +315,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -343,7 +343,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -370,7 +370,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -396,7 +396,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -422,7 +422,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
diff --git a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
index d4fd1acf..5eaeb985 100644
--- a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
@@ -28,7 +28,7 @@ namespace WixToolsetTest.Converters
                 File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName));
 
                 var messaging = new MockMessaging();
-                var converter = new Wix3Converter(messaging, 4);
+                var converter = new WixConverter(messaging, 4);
                 var errors = converter.ConvertFile(targetFile, true);
 
                 Assert.Equal(8, errors);
@@ -55,7 +55,7 @@ namespace WixToolsetTest.Converters
                 File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName));
 
                 var messaging = new MockMessaging();
-                var converter = new Wix3Converter(messaging, 4);
+                var converter = new WixConverter(messaging, 4);
                 var errors = converter.ConvertFile(targetFile, true);
 
                 Assert.Equal(7, errors);
@@ -164,7 +164,7 @@ namespace WixToolsetTest.Converters
         private static void EnsureFixed(string targetFile)
         {
             var messaging2 = new MockMessaging();
-            var converter2 = new Wix3Converter(messaging2, 4);
+            var converter2 = new WixConverter(messaging2, 4);
             var errors2 = converter2.ConvertFile(targetFile, true);
             Assert.Equal(0, errors2);
         }
diff --git a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
index 27d45bc6..e19de6e3 100644
--- a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
@@ -34,7 +34,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -72,7 +72,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
diff --git a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs b/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
index b61dbb10..10ee2748 100644
--- a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
+++ b/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
@@ -37,7 +37,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(4, errors);
@@ -75,7 +75,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -114,7 +114,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(2, errors);
@@ -150,7 +150,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(2, errors);
@@ -175,7 +175,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
diff --git a/src/test/WixToolsetTest.Converters/PropertyFixture.cs b/src/test/WixToolsetTest.Converters/PropertyFixture.cs
index 90c1e5c9..e50a6518 100644
--- a/src/test/WixToolsetTest.Converters/PropertyFixture.cs
+++ b/src/test/WixToolsetTest.Converters/PropertyFixture.cs
@@ -32,7 +32,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -96,7 +96,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
             var errors = converter.ConvertDocument(document);
 
             var actual = UnformattedDocumentString(document);
diff --git a/src/test/WixToolsetTest.Converters/SequenceFixture.cs b/src/test/WixToolsetTest.Converters/SequenceFixture.cs
index 1abe6c0c..2fbc4d4a 100644
--- a/src/test/WixToolsetTest.Converters/SequenceFixture.cs
+++ b/src/test/WixToolsetTest.Converters/SequenceFixture.cs
@@ -36,7 +36,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(2, errors);
-- 
cgit v1.2.3-55-g6feb