diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index f43ac533a7..e216516437 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 88a43fd1c1..67adb9907c 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -18,9 +18,9 @@ - + - + @@ -28,20 +28,20 @@ - + - + - + diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 85bcd07185..2915ce44e2 100644 --- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -17,7 +17,7 @@ - 0.13.0 + 0.13.1 5.0.0 diff --git a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj index 142f210d44..89f2711db5 100644 --- a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj +++ b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj @@ -8,11 +8,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs index 74d364256f..b1f3fbf847 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs @@ -148,16 +148,34 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging Name = "test", }; bool result = PackageBuilder.SavePackage(def); - + //Update values and save def.Name = "updated"; + def.ContentNodeId = "test"; + def.Languages.Add("Danish"); + def.Languages.Add("English"); + def.Scripts.Add("TestScript1"); + def.Scripts.Add("TestScript2"); result = PackageBuilder.SavePackage(def); Assert.IsTrue(result); - // re-get def = PackageBuilder.GetById(def.Id); Assert.AreEqual("updated", def.Name); - - // TODO: There's a whole lot more assertions to be done + Assert.Multiple(() => + { + Assert.AreEqual("updated", def.Name); + Assert.AreEqual("test", def.ContentNodeId); + Assert.AreEqual(2, def.Languages.Count()); + Assert.AreEqual(2, def.Scripts.Count()); + Assert.AreEqual(0, def.DataTypes.Count()); + Assert.AreEqual(0, def.DictionaryItems.Count()); + Assert.AreEqual(0, def.DocumentTypes.Count()); + Assert.AreEqual(0, def.Macros.Count()); + Assert.AreEqual(0, def.MediaTypes.Count()); + Assert.AreEqual(0, def.MediaUdis.Count()); + Assert.AreEqual(0, def.PartialViews.Count()); + Assert.AreEqual(0, def.Stylesheets.Count()); + Assert.AreEqual(0, def.Templates.Count()); + }); } [Test] @@ -259,15 +277,24 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging using (FileStream packageZipStream = File.OpenRead(packageXmlPath)) using (ZipArchive zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out XDocument packageXml)) { - Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString()); - Assert.IsNotNull(zipArchive.GetEntry("media/media/test-file.txt")); - - Assert.AreEqual( - $"", - packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting)); - - // TODO: There's a whole lot more assertions to be done - + string test = "test-file.txt"; + Assert.Multiple(() => + { + var mediaEntry = zipArchive.GetEntry("media/media/test-file.txt"); + Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString()); + Assert.IsNotNull(mediaEntry); + Assert.AreEqual(test, mediaEntry.Name); + Assert.IsNotNull(zipArchive.GetEntry("package.xml")); + Assert.AreEqual( + $"", + packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting)); + Assert.AreEqual(2, zipArchive.Entries.Count()); + Assert.AreEqual(ZipArchiveMode.Read, zipArchive.Mode); + Assert.IsNull(packageXml.DocumentType); + Assert.IsNull(packageXml.NextNode); + Assert.IsNull(packageXml.Parent); + Assert.IsNull(packageXml.PreviousNode); + }); } } @@ -297,12 +324,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging using (var packageXmlStream = File.OpenRead(packageXmlPath)) { var xml = XDocument.Load(packageXmlStream); - Assert.AreEqual("umbPackage", xml.Root.Name.ToString()); - - Assert.AreEqual($"", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting)); - - // TODO: There's a whole lot more assertions to be done - + Assert.Multiple(() => + { + Assert.AreEqual("umbPackage", xml.Root.Name.ToString()); + Assert.AreEqual($"", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting)); + Assert.IsNull(xml.DocumentType); + Assert.IsNull(xml.Parent); + Assert.IsNull(xml.NextNode); + Assert.IsNull(xml.PreviousNode); + }); } } } diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs index d0999a0abc..ee19cd081c 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs @@ -32,9 +32,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage)); using var fileStream = testPackageFile.OpenRead(); CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream)); - Assert.IsNotNull(package); - Assert.AreEqual("Document Type Picker", package.Name); - Assert.AreEqual(1, package.DataTypes.Count()); + Assert.Multiple(() => + { + Assert.IsNotNull(package); + Assert.AreEqual("Document Type Picker", package.Name); + Assert.AreEqual(1, package.DataTypes.Count()); + }); } [Test] @@ -43,12 +46,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), HelloPackage)); using var fileStream = testPackageFile.OpenRead(); CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream)); - Assert.IsNotNull(package); - Assert.AreEqual("Hello", package.Name); - Assert.AreEqual(1, package.Documents.Count()); - Assert.AreEqual(1, package.DocumentTypes.Count()); - Assert.AreEqual(1, package.Templates.Count()); - Assert.AreEqual(1, package.DataTypes.Count()); + Assert.Multiple(() => + { + Assert.IsNotNull(package); + Assert.AreEqual("Hello", package.Name); + Assert.AreEqual(1, package.Documents.Count()); + Assert.AreEqual(1, package.DocumentTypes.Count()); + Assert.AreEqual(1, package.Templates.Count()); + Assert.AreEqual(1, package.DataTypes.Count()); + }); } [Test] @@ -66,9 +72,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging using var fileStream = File.OpenRead(packageFile); CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream)); InstallWarnings preInstallWarnings = package.Warnings; - Assert.IsNotNull(preInstallWarnings); - - // TODO: More Asserts + var dataType = package.DataTypes.First(); + Assert.Multiple(() => + { + Assert.AreEqual("Document Type Picker", package.Name); + Assert.AreEqual("3593d8e7-8b35-47b9-beda-5e830ca8c93c", dataType.LastAttribute?.Value); + Assert.AreEqual("Document Type Picker", dataType.FirstAttribute?.Value); + Assert.IsNotNull(preInstallWarnings); + Assert.AreEqual(0, preInstallWarnings.ConflictingMacros.Count()); + Assert.AreEqual(0, preInstallWarnings.ConflictingStylesheets.Count()); + Assert.AreEqual(0, preInstallWarnings.ConflictingTemplates.Count()); + }); } [Test] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index 2b2bb11f21..9ce4f53988 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -76,11 +76,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index 00f25a5d12..0d7777fb26 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -16,9 +16,9 @@ - + - + diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 583bc07842..7fca2faa5f 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -25,8 +25,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 40fe7fe46a..7e2d51b12c 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -66,7 +66,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive