yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds test

Browse Source
This commit is contained in:
Shannon
2019-01-14 17:56:41 +11:00
parent 65e98928d4
commit aa6342cc30
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs
View File

@@ -52,7 +52,7 @@ namespace Umbraco.Core.Packaging
UmbracoVersion = new Version((int)requirements.Element("major"), (int)requirements.Element("minor"), (int)requirements.Element("patch")),
UmbracoVersionRequirementsType = requirements.AttributeValue<string>("type").IsNullOrWhiteSpace() ? RequirementsType.Legacy : Enum<RequirementsType>.Parse(requirements.AttributeValue<string>("type")),
Control = package.Element("control")?.Value,
Actions = xml.Element("Actions")?.ToString(SaveOptions.None) ?? "<Actions></Actions>", //take the entire outer xml value
Actions = xml.Root.Element("Actions")?.ToString(SaveOptions.None) ?? "<Actions></Actions>", //take the entire outer xml value
Files = xml.Root.Element("files")?.Elements("file")?.Select(x => new CompiledPackageFile
{
UniqueFileName = x.Element("guid")?.Value,
@@ -60,14 +60,14 @@ namespace Umbraco.Core.Packaging
OriginalPath = x.Element("orgPath")?.Value
}).ToList() ?? new List<CompiledPackageFile>(),
Macros = xml.Element("Macros")?.Elements("macro") ?? Enumerable.Empty<XElement>(),
Templates = xml.Element("Templates")?.Elements("Template") ?? Enumerable.Empty<XElement>(),
Stylesheets = xml.Element("Stylesheets")?.Elements("styleSheet") ?? Enumerable.Empty<XElement>(),
DataTypes = xml.Element("DataTypes")?.Elements("DataType") ?? Enumerable.Empty<XElement>(),
Languages = xml.Element("Languages")?.Elements("Language") ?? Enumerable.Empty<XElement>(),
DictionaryItems = xml.Element("DictionaryItems")?.Elements("DictionaryItem") ?? Enumerable.Empty<XElement>(),
DocumentTypes = xml.Element("DocumentTypes")?.Elements("DocumentType") ?? Enumerable.Empty<XElement>(),
Documents = xml.Element("Documents")?.Elements("DocumentSet") ?? Enumerable.Empty<XElement>(),
Macros = xml.Root.Element("Macros")?.Elements("macro") ?? Enumerable.Empty<XElement>(),
Templates = xml.Root.Element("Templates")?.Elements("Template") ?? Enumerable.Empty<XElement>(),
Stylesheets = xml.Root.Element("Stylesheets")?.Elements("styleSheet") ?? Enumerable.Empty<XElement>(),
DataTypes = xml.Root.Element("DataTypes")?.Elements("DataType") ?? Enumerable.Empty<XElement>(),
Languages = xml.Root.Element("Languages")?.Elements("Language") ?? Enumerable.Empty<XElement>(),
DictionaryItems = xml.Root.Element("DictionaryItems")?.Elements("DictionaryItem") ?? Enumerable.Empty<XElement>(),
DocumentTypes = xml.Root.Element("DocumentTypes")?.Elements("DocumentType") ?? Enumerable.Empty<XElement>(),
Documents = xml.Root.Element("Documents")?.Elements("DocumentSet") ?? Enumerable.Empty<XElement>(),
};
def.Warnings = GetPreInstallWarnings(def, applicationRootFolder);

22
src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
View File

@@ -87,7 +87,7 @@ namespace Umbraco.Tests.Packaging
Assert.AreEqual("@tentonipete", package.Author);
Assert.AreEqual("auros.co.uk", package.AuthorUrl);
Assert.AreEqual("Document Type Picker datatype that enables back office user to select one or many document types.", package.Readme);
Assert.AreEqual(1, package.DataTypes.Count());
}
[Test]
@@ -114,6 +114,26 @@ namespace Umbraco.Tests.Packaging
Assert.AreEqual(1, result.Count);
Assert.AreEqual("bin\\Auros.DocumentTypePicker.dll", result[0]);
Assert.IsTrue(File.Exists(Path.Combine(IOHelper.MapPath("~/" + _testBaseFolder), result[0])));
//make sure the def is updated too
Assert.AreEqual(result.Count(), def.Files.Count);
}
[Test]
public void Install_Data()
{
var package = PackageInstallation.ReadPackage(documentTypePickerUmb);
var def = PackageDefinition.FromCompiledPackage(package);
def.Id = 1;
def.PackageId = Guid.NewGuid();
var summary = PackageInstallation.InstallPackageData(def, package, -1);
Assert.AreEqual(1, summary.DataTypesInstalled.Count());
//make sure the def is updated too
Assert.AreEqual(summary.DataTypesInstalled.Count(), def.DataTypes.Count);
}