Add a basic unit test for the round msmq decompiler round trip.

Needed fix up for Group decompiler to work correctly, adding to Index,
and fixing where the Group name column is located.

Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>

3 files changed, 22 insertions, 21 deletions

diff --git a/src/ext/Msmq/wixext/MsmqDecompiler.cs b/src/ext/Msmq/wixext/MsmqDecompiler.cs
index 53734e88..44bd8aba 100644
--- a/src/ext/Msmq/wixext/MsmqDecompiler.cs
+++ b/src/ext/Msmq/wixext/MsmqDecompiler.cs
@@ -144,17 +144,17 @@ namespace WixToolset.Msmq
 
                 if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueueAttributes.Authenticate))
                 {
-                    messageQueue.Add(new XAttribute("Authenticate", YesNoType.Yes));
+                    messageQueue.Add(new XAttribute("Authenticate", "yes"));
                 }
 
                 if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueueAttributes.Journal))
                 {
-                    messageQueue.Add(new XAttribute("Journal", YesNoType.Yes));
+                    messageQueue.Add(new XAttribute("Journal", "yes"));
                 }
 
                 if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueueAttributes.Transactional))
                 {
-                    messageQueue.Add(new XAttribute("Transactional", YesNoType.Yes));
+                    messageQueue.Add(new XAttribute("Transactional", "yes"));
                 }
 
                 this.DecompilerHelper.IndexElement(row, messageQueue);
@@ -337,82 +337,82 @@ namespace WixToolset.Msmq
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.DeleteMessage))
             {
-                element.Add("DeleteMessage", YesNoType.Yes);
+                element.Add(new XAttribute("DeleteMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.PeekMessage))
             {
-                element.Add("PeekMessage", YesNoType.Yes);
+                element.Add(new XAttribute("PeekMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.WriteMessage))
             {
-                element.Add("WriteMessage", YesNoType.Yes);
+                element.Add(new XAttribute("WriteMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.DeleteJournalMessage))
             {
-                element.Add("DeleteJournalMessage", YesNoType.Yes);
+                element.Add(new XAttribute("DeleteJournalMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.SetQueueProperties))
             {
-                element.Add("SetQueueProperties", YesNoType.Yes);
+                element.Add(new XAttribute("SetQueueProperties", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.GetQueueProperties))
             {
-                element.Add("GetQueueProperties", YesNoType.Yes);
+                element.Add(new XAttribute("GetQueueProperties", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.DeleteQueue))
             {
-                element.Add("DeleteQueue", YesNoType.Yes);
+                element.Add(new XAttribute("DeleteQueue", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.GetQueuePermissions))
             {
-                element.Add("GetQueuePermissions", YesNoType.Yes);
+                element.Add(new XAttribute("GetQueuePermissions", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.ChangeQueuePermissions))
             {
-                element.Add("ChangeQueuePermissions", YesNoType.Yes);
+                element.Add(new XAttribute("ChangeQueuePermissions", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.TakeQueueOwnership))
             {
-                element.Add("TakeQueueOwnership", YesNoType.Yes);
+                element.Add(new XAttribute("TakeQueueOwnership", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.ReceiveMessage))
             {
-                element.Add("ReceiveMessage", YesNoType.Yes);
+                element.Add(new XAttribute("ReceiveMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.ReceiveJournalMessage))
             {
-                element.Add("ReceiveJournalMessage", YesNoType.Yes);
+                element.Add(new XAttribute("ReceiveJournalMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericRead))
             {
-                element.Add("QueueGenericRead", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericRead", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericWrite))
             {
-                element.Add("QueueGenericWrite", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericWrite", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericExecute))
             {
-                element.Add("QueueGenericExecute", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericExecute", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericAll))
             {
-                element.Add("QueueGenericAll", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericAll", "yes"));
             }
         }
     }
diff --git a/src/ext/Msmq/wixext/MsmqExtensionFactory.cs b/src/ext/Msmq/wixext/MsmqExtensionFactory.cs
index de9f786d..6bb3fb64 100644
--- a/src/ext/Msmq/wixext/MsmqExtensionFactory.cs
+++ b/src/ext/Msmq/wixext/MsmqExtensionFactory.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Msmq
         protected override IReadOnlyCollection<Type> ExtensionTypes => new[]
         {
             typeof(MsmqCompiler),
+            typeof(MsmqDecompiler),
             typeof(MsmqExtensionData),
             typeof(MsmqWindowsInstallerBackendBinderExtension),
         };
diff --git a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
index 610e9409..0046c7ec 100644
--- a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
+++ b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
@@ -34,7 +34,7 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("MessageQueue_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4MessageQueue", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
-                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             symbolIdIsPrimaryKey: true
@@ -48,7 +48,7 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("MessageQueue_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4MessageQueue", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
-                new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             symbolIdIsPrimaryKey: true