Update old test code to latest SWID tag spec

Fixes 6675

1 files changed, 8 insertions, 5 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
index b63be5f5..b0cdea16 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
@@ -56,7 +56,7 @@ namespace WixToolsetTest.BurnE2E
             packageAv1.VerifyTestRegistryRootDeleted();
         }
 
-        [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6675")]
+        [RuntimeFact]
         public void CanPatchSwidTag()
         {
             var originalVersion = "1.0.0.0";
@@ -116,8 +116,7 @@ namespace WixToolsetTest.BurnE2E
 
         private static void VerifySwidTagVersion(string tagName, string expectedVersion)
         {
-            var regidFolder = Environment.ExpandEnvironmentVariables(@"%ProgramData%\regid.1995-08.com.example");
-            var tagPath = Path.Combine(regidFolder, "regid.1995-08.com.example " + tagName + ".swidtag");
+            var tagPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "TestingSwidTags", "swidtag", tagName + ".swidtag");
             string version = null;
 
             if (File.Exists(tagPath))
@@ -126,11 +125,15 @@ namespace WixToolsetTest.BurnE2E
                 doc.Load(tagPath);
 
                 var ns = new XmlNamespaceManager(doc.NameTable);
-                ns.AddNamespace("s", "http://standards.iso.org/iso/19770/-2/2009/schema.xsd");
+                ns.AddNamespace("s", "http://standards.iso.org/iso/19770/-2/2015/schema.xsd");
 
-                var versionNode = doc.SelectSingleNode("/s:software_identification_tag/s:product_version/s:name", ns);
+                var versionNode = doc.SelectSingleNode("/s:SoftwareIdentity/@version", ns);
                 version = versionNode?.InnerText ?? String.Empty;
             }
+            else
+            {
+                Assert.True(expectedVersion == null, $"Did not find SWID tag with expected version {expectedVersion} at: {tagPath}");
+            }
 
             Assert.Equal(expectedVersion, version);
         }