From 69060bbc15e26970fe93f6ad84f76e875affa98e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 8 Jul 2021 13:58:27 -0600
Subject: [PATCH] fixes tests

---
 .../Packaging/PackageMigrationResource.cs        | 12 ++++++++----
 .../Packaging/CreatedPackagesRepositoryTests.cs  | 16 +++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageMigrationResource.cs b/src/Umbraco.Core/Packaging/PackageMigrationResource.cs
index 14cffc041f..8f777d2b0a 100644
--- a/src/Umbraco.Core/Packaging/PackageMigrationResource.cs
+++ b/src/Umbraco.Core/Packaging/PackageMigrationResource.cs
@@ -45,10 +45,11 @@ namespace Umbraco.Cms.Core.Packaging
         }
 
         public static ZipArchive GetEmbeddedPackageDataManifest(Type planType, out XDocument packageXml)
-        {   
-            Stream stream = GetEmbeddedPackageStream(planType);
+            => GetPackageDataManifest(GetEmbeddedPackageStream(planType), out packageXml);
 
-            var zip = new ZipArchive(stream, ZipArchiveMode.Read);
+        public static ZipArchive GetPackageDataManifest(Stream packageZipStream, out XDocument packageXml)
+        {
+            var zip = new ZipArchive(packageZipStream, ZipArchiveMode.Read);
             ZipArchiveEntry packageXmlEntry = zip.GetEntry("package.xml");
             if (packageXmlEntry == null)
             {
@@ -56,7 +57,10 @@ namespace Umbraco.Cms.Core.Packaging
             }
 
             using (Stream packageXmlStream = packageXmlEntry.Open())
-            using (var xmlReader = XmlReader.Create(packageXmlStream))
+            using (var xmlReader = XmlReader.Create(packageXmlStream, new XmlReaderSettings
+            {
+                IgnoreWhitespace = true
+            }))
             {
                 packageXml = XDocument.Load(xmlReader);
             }
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
index 892c7595d5..339fa704b7 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
@@ -204,10 +204,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging
             
             string packageXmlPath = PackageBuilder.ExportPackage(def);
 
-            using (var stream = File.OpenRead(packageXmlPath))
+            using (var packageZipStream = File.OpenRead(packageXmlPath))
+            using (ZipArchive zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out XDocument packageXml))
             {
-                var xml = XDocument.Load(stream);
-                var dictionaryItems = xml.Root.Element("DictionaryItems");
+                var dictionaryItems = packageXml.Root.Element("DictionaryItems");
                 Assert.IsNotNull(dictionaryItems);
                 var rootItems = dictionaryItems.Elements("DictionaryItem").ToList();
                 Assert.AreEqual(2, rootItems.Count);
@@ -244,12 +244,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging
             def = PackageBuilder.GetById(def.Id); // re-get
             Assert.IsNotNull(def.PackagePath);
 
-            using (var packageXmlStream = File.OpenRead(packageXmlPath))
+            using (FileStream packageZipStream = File.OpenRead(packageXmlPath))
+            using (ZipArchive zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out XDocument packageXml))
             {
-                var xml = XDocument.Load(packageXmlStream);
-                Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
+                Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString());
 
-                Assert.AreEqual($"<Templates><Template><Name>Text page</Name><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
+                Assert.AreEqual(
+                    $"<Templates><Template><Name>Text page</Name><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>",
+                    packageXml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
 
                 // TODO: There's a whole lot more assertions to be done