Skip to content

Commit

Permalink
Removed deprecated schemas and fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
PaoloPia committed Jun 1, 2021
1 parent 8dd644d commit 7ad0575
Show file tree
Hide file tree
Showing 133 changed files with 1,095 additions and 118,125 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -348,6 +348,8 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# Custom configuration files
/src/lib/PnP.Framework.Test/App.config
/src/lib/PnP.Framework.Modernization.Test/App.config
/src/lib/PnP.Framework.Test/Isolated/Doodle.cs
Expand Up @@ -81,57 +81,9 @@ public void OpenXMLLoadTemplateOriginal()
"Templates");

var openXMLConnector = new OpenXMLConnector(packageFileNameBackwardsCompatibility, fileSystemConnector);
var templateFile = openXMLConnector.GetFileStream("ProvisioningSchema-2015-12-FullSample-02.xml");
var templateFile = openXMLConnector.GetFileStream("ProvisioningSchema-2019-03-FullSample-01.xml");

XMLPnPSchemaV201512Formatter formatter = new XMLPnPSchemaV201512Formatter();
var checkTemplate = formatter.IsValid(templateFile);

Assert.IsTrue(checkTemplate);

var image1 = openXMLConnector.GetFileStream("garagelogo.png", "Images");
Assert.IsNotNull(image1);

var image2 = openXMLConnector.GetFileStream("garagebg.jpg", "Images");
Assert.IsNotNull(image2);
}


[TestMethod]
public void OpenXMLLoadTemplateOriginal2()
{
var fileSystemConnector = new FileSystemConnector(
String.Format(@"{0}\..\..\..\Resources",
AppDomain.CurrentDomain.BaseDirectory),
"Templates");

var openXMLConnector = new OpenXMLConnector(packageFileNameBackwardsCompatibility2, fileSystemConnector);
var templateFile = openXMLConnector.GetFileStream("ProvisioningSchema-2015-12-FullSample-02.xml");

XMLPnPSchemaV201512Formatter formatter = new XMLPnPSchemaV201512Formatter();
var checkTemplate = formatter.IsValid(templateFile);

Assert.IsTrue(checkTemplate);

var image1 = openXMLConnector.GetFileStream("garagelogo.png", "Images");
Assert.IsNotNull(image1);

var image2 = openXMLConnector.GetFileStream("garagebg.jpg.jpg", "Images");
Assert.IsNotNull(image2);
}


[TestMethod]
public void OpenXMLLoadTemplate()
{
var fileSystemConnector = new FileSystemConnector(
String.Format(@"{0}\..\..\..\Resources",
AppDomain.CurrentDomain.BaseDirectory),
"Templates");

var openXMLConnector = new OpenXMLConnector(packageFileName, fileSystemConnector);
var templateFile = openXMLConnector.GetFileStream("ProvisioningSchema-2015-12-FullSample-02.xml");

XMLPnPSchemaV201512Formatter formatter = new XMLPnPSchemaV201512Formatter();
XMLPnPSchemaV201903Serializer formatter = new XMLPnPSchemaV201903Serializer();
var checkTemplate = formatter.IsValid(templateFile);

Assert.IsTrue(checkTemplate);
Expand Down
Expand Up @@ -31,7 +31,7 @@ internal void SiteCollectionDirectoryFiles(string url)
var result = TestProvisioningTemplate(cc, "files_add_1605.xml", Handlers.Files | Handlers.Lists);
FilesValidator fv = new FilesValidator
{
SchemaVersion = PnP.Framework.Provisioning.Providers.Xml.XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = PnP.Framework.Provisioning.Providers.Xml.XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(fv.Validate1605(result.SourceTemplate, cc));
}
Expand Down Expand Up @@ -60,7 +60,7 @@ internal void WebDirectoryFiles(string url)
var result = TestProvisioningTemplate(cc, "files_add_1605.xml", Handlers.Files | Handlers.Lists);
FilesValidator fv = new FilesValidator
{
SchemaVersion = PnP.Framework.Provisioning.Providers.Xml.XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = PnP.Framework.Provisioning.Providers.Xml.XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(fv.Validate1605(result.SourceTemplate, cc));
}
Expand Down
Expand Up @@ -59,7 +59,7 @@ internal void SiteCollection1605ListAdding(string url)

ListInstanceValidator lv = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv.Validate(result.SourceTemplate.Lists, result.TargetTemplate.Lists, result.TargetTokenParser));

Expand All @@ -71,7 +71,7 @@ internal void SiteCollection1605ListAdding(string url)

ListInstanceValidator lv2 = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv2.Validate(result2.SourceTemplate.Lists, result2.TargetTemplate.Lists, result2.TargetTokenParser));
}
Expand All @@ -89,7 +89,7 @@ internal void SiteCollection1705ListAdding(string url)
var result = TestProvisioningTemplate(cc, "list_add_1705.xml", Handlers.Lists);
ListInstanceValidator lv = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2017_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv.Validate(result.SourceTemplate.Lists, result.TargetTemplate.Lists, result.TargetTokenParser));

Expand All @@ -101,7 +101,7 @@ internal void SiteCollection1705ListAdding(string url)

ListInstanceValidator lv2 = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2017_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv2.Validate(result2.SourceTemplate.Lists, result2.TargetTemplate.Lists, result2.TargetTokenParser));
}
Expand Down Expand Up @@ -159,7 +159,7 @@ internal void Web1605ListAdding(string url)

ListInstanceValidator lv = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv.Validate(result.SourceTemplate.Lists, result.TargetTemplate.Lists, result.TargetTokenParser));

Expand All @@ -171,7 +171,7 @@ internal void Web1605ListAdding(string url)

ListInstanceValidator lv2 = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv2.Validate(result2.SourceTemplate.Lists, result2.TargetTemplate.Lists, result2.TargetTokenParser));
}
Expand All @@ -188,7 +188,7 @@ internal void Web1705ListAdding(string url)
var result = TestProvisioningTemplate(cc, "list_add_1705.xml", Handlers.Lists);
ListInstanceValidator lv = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2017_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv.Validate(result.SourceTemplate.Lists, result.TargetTemplate.Lists, result.TargetTokenParser));

Expand All @@ -199,7 +199,7 @@ internal void Web1705ListAdding(string url)

ListInstanceValidator lv2 = new ListInstanceValidator(cc)
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2017_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(lv2.Validate(result2.SourceTemplate.Lists, result2.TargetTemplate.Lists, result2.TargetTokenParser));
}
Expand Down
Expand Up @@ -34,7 +34,7 @@ internal void SiteCollectionNavigation(string url)
var result = TestProvisioningTemplate(cc, "navigation_add_1605.xml", Handlers.Navigation, null, ptci);
NavigationValidator nv = new NavigationValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(nv.Validate(result.SourceTemplate.Navigation, result.TargetTemplate.Navigation, result.SourceTokenParser));
#endregion
Expand All @@ -45,7 +45,7 @@ internal void SiteCollectionNavigation(string url)
var result2 = TestProvisioningTemplate(cc, "navigation_add2_1605.xml", Handlers.Navigation, null, ptci);
NavigationValidator nv2 = new NavigationValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(nv2.Validate(result2.SourceTemplate.Navigation, result2.TargetTemplate.Navigation, result2.SourceTokenParser));
#endregion
Expand Down Expand Up @@ -73,7 +73,7 @@ internal void WebNavigation(string url)
var result = TestProvisioningTemplate(cc, "navigation_add_1605.xml", Handlers.Navigation, null, ptci);
NavigationValidator nv = new NavigationValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(nv.Validate(result.SourceTemplate.Navigation, result.TargetTemplate.Navigation, result.SourceTokenParser));
#endregion
Expand All @@ -84,7 +84,7 @@ internal void WebNavigation(string url)
var result2 = TestProvisioningTemplate(cc, "navigation_add2_1605.xml", Handlers.Navigation, null, ptci);
NavigationValidator nv2 = new NavigationValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(nv2.Validate(result2.SourceTemplate.Navigation, result2.TargetTemplate.Navigation, result2.SourceTokenParser));
#endregion
Expand All @@ -95,7 +95,7 @@ internal void WebNavigation(string url)
var result3 = TestProvisioningTemplate(cc, "navigation_add3_1605.xml", Handlers.Navigation, null, ptci);
NavigationValidator nv3 = new NavigationValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(nv3.Validate(result3.SourceTemplate.Navigation, result3.TargetTemplate.Navigation, result3.SourceTokenParser));
#endregion
Expand Down
Expand Up @@ -34,14 +34,14 @@ internal void SiteCollectionTermGroup(string url)
var result2 = TestProvisioningTemplate(cc, "termgroup_delta_1605.xml", Handlers.TermGroups, null, ptci);
TermGroupValidator tv2 = new TermGroupValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(tv2.Validate(result2.SourceTemplate.TermGroups, result2.TargetTemplate.TermGroups, result2.TargetTokenParser));

var result3 = TestProvisioningTemplate(cc, "termgroup_delta_1605_1.xml", Handlers.TermGroups, null, ptci);
TermGroupValidator tv3 = new TermGroupValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(tv3.Validate(result3.SourceTemplate.TermGroups, result3.TargetTemplate.TermGroups, result3.TargetTokenParser));
}
Expand Down Expand Up @@ -70,14 +70,14 @@ internal void WebTermGroup(string url)
var result2 = TestProvisioningTemplate(cc, "termgroup_delta_1605.xml", Handlers.TermGroups, null, ptci);
TermGroupValidator tv2 = new TermGroupValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(tv2.Validate(result2.SourceTemplate.TermGroups, result2.TargetTemplate.TermGroups, result2.TargetTokenParser));

var result3 = TestProvisioningTemplate(cc, "termgroup_delta_1605_1.xml", Handlers.TermGroups, null, ptci);
TermGroupValidator tv3 = new TermGroupValidator
{
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05
SchemaVersion = XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2021_03
};
Assert.IsTrue(tv3.Validate(result3.SourceTemplate.TermGroups, result3.TargetTemplate.TermGroups, result3.TargetTokenParser));
}
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<pnp:ProvisioningTemplate ID="auditsettings_add" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="auditsettings_add" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:AuditSettings TrimAuditLog="true" AuditLogTrimmingRetention="4">
<pnp:Audit AuditFlag="Update"/>
</pnp:AuditSettings>
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<pnp:ProvisioningTemplate ID="clientsidepages_add_1705" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2017/05/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="clientsidepages_add_1705" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:ClientSidePages>
<!-- Basic page, showing how to add a text control in a single column section with page overwrite -->
<pnp:ClientSidePage PageName="simple.aspx" Overwrite="true">
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<pnp:ProvisioningTemplate ID="composedlook_add_1" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="composedlook_add_1" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<!-- Set OOB composed look -->
<pnp:ComposedLook Name="Characters" ColorFile="" FontFile ="" BackgroundFile =""/>
</pnp:ProvisioningTemplate>
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<pnp:ProvisioningTemplate ID="composedlook_add_2" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="composedlook_add_2" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<!-- Set custom composed look -->
<pnp:ComposedLook Name="CL_2" Version="1"
BackgroundFile="{sitecollection}/SiteAssets/garagebg.jpg"
Expand Down
Expand Up @@ -4,7 +4,7 @@
supporting template: add files needed in content type tests
-->

<pnp:ProvisioningTemplate ID="composedlook_files" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="composedlook_files" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:Files>
<pnp:File Src="garagebg.jpg" Folder="SiteAssets" Overwrite="true" />
<pnp:File Src="garagelogo.png" Folder="SiteAssets" Overwrite="true" />
Expand Down
Expand Up @@ -51,7 +51,7 @@ Base template: goal is to verify that all content type properties work as expect
-->

<pnp:ProvisioningTemplate ID="contenttype_add" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="contenttype_add" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<!-- Supporting fields to test content types -->
<pnp:SiteFields>
<Field ID="{92BC6A41-D501-4FE2-938E-17FBF574A7CB}" Type="Text" Name="FLD_CT_1" DisplayName="Fld CT 1" Group="PnP Demo" MaxLength="255" AllowDeletion="TRUE" />
Expand Down
Expand Up @@ -28,7 +28,7 @@ Base template: goal is to verify the delta behavior on content types. Note that
For DocumentSet features (DocumentSetTemplate element) there's currently no delta handling implemented!
-->

<pnp:ProvisioningTemplate ID="contenttype_delta_1" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="contenttype_delta_1" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<!-- Test content types for delta handling -->
<pnp:ContentTypes>
<!-- Document content types 0x0101 -->
Expand Down
Expand Up @@ -4,7 +4,7 @@
supporting template: add files needed in content type tests
-->

<pnp:ProvisioningTemplate ID="contenttype_files" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="contenttype_files" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:Features>
<pnp:SiteFeatures>
<pnp:Feature ID="3bae86a2-776d-499d-9db8-fa4cdc7884f8" Description="Document set" />
Expand Down
Expand Up @@ -5,7 +5,7 @@ Delta template: goal is to verify if the custom action delta handling is working
please keep this XML up to date if additional properties are added to the delta handling
-->

<pnp:ProvisioningTemplate ID="customaction_1605_delta_2" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2016/05/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="customaction_1605_delta_2" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:CustomActions>

<!-- Custom action properties that can be updated via delta handling:
Expand Down
Expand Up @@ -22,7 +22,7 @@ Base template: Goal is to verify that all custom action properties work as expec
-->

<pnp:ProvisioningTemplate ID="customaction_base" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="customaction_base" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:CustomActions>
<pnp:SiteCustomActions>
<pnp:CustomAction Name="CA_1" Description="ca 1" Group="SiteTasks" Location="Microsoft.SharePoint.SiteSettings" Title="CA 1 Title" Sequence="1000" Url="https://spmanaged.azurewebsites.net/pages/index.aspx?SPHostUrl={sitename}" Rights="31" Enabled="true"/>
Expand Down
Expand Up @@ -5,7 +5,7 @@ Delta template: goal is to verify if the custom action delta handling is working
please keep this XML up to date if additional properties are added to the delta handling
-->

<pnp:ProvisioningTemplate ID="customaction_delta_1" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2015/12/ProvisioningSchema">
<pnp:ProvisioningTemplate ID="customaction_delta_1" Version="1" xmlns:pnp="http://schemas.dev.office.com/PnP/2021/03/ProvisioningSchema">
<pnp:CustomActions>

<!-- Custom action properties that can be updated via delta handling:
Expand Down

0 comments on commit 7ad0575

Please sign in to comment.