Peter Centgraf pushed to branch feature/REPO-1872 at cms-community / hippo-repository
Commits: 109be1c4 by Peter Centgraf at 2017-11-14T16:19:27+01:00 REPO-1872 Auto-test for filtering UUIDs and excluding paths from auto-exported content - - - - - 11 changed files: - engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-config/test.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/content.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids/child.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-module.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-config/test.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/content.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids/child.yaml - + engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-module.yaml Changes: ===================================== engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java ===================================== --- a/engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java +++ b/engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java @@ -61,6 +61,18 @@ public class AutoExportIntegrationTest { */ @Test + public void content_filters() throws Exception { + // test that autoexport:filteruuids and autoexport:excluded are applied to content + new Fixture("content_filters").test(session -> { + session.getNode("/content/uuids").setProperty("newProperty", "value"); + session.getNode("/content/uuids/child").setProperty("newProperty", "value"); + session.getNode("/content") + .addNode("excluded", "nt:unstructured") + .addNode("child", "nt:unstructured"); + }); + } + + @Test public void config_sns_create_new() throws Exception { new Fixture("config_sns_create_new").test(session -> { final Node container = session.getNode("/config").addNode("container", "nt:unstructured"); ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-config/test.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-config/test.yaml @@ -0,0 +1,14 @@ +definitions: + config: + /content: + .meta:category: content + /hippo:configuration/hippo:modules/autoexport: + /hippo:moduleconfig: + autoexport:filteruuidpaths: + operation: add + type: string + value: ['/content/uuids'] + autoexport:excluded: + operation: add + type: string + value: ['/content/excluded','/content/excluded/**'] ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/content.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/content.yaml @@ -0,0 +1,2 @@ +/content: + jcr:primaryType: nt:unstructured \ No newline at end of file ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids.yaml @@ -0,0 +1,3 @@ +/content/uuids: + jcr:primaryType: nt:unstructured + jcr:mixinTypes: ['mix:referenceable'] \ No newline at end of file ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids/child.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids/child.yaml @@ -0,0 +1,3 @@ +/content/uuids/child: + jcr:primaryType: nt:unstructured + jcr:mixinTypes: ['mix:referenceable'] ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-module.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-module.yaml @@ -0,0 +1,7 @@ +group: + name: hippo-cms-test + after: [hippo-cms, test-group] +project: + name: autoexport-integration-test-project + after: hippo-repository +module: autoexport-integration-test-module ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-config/test.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-config/test.yaml @@ -0,0 +1,14 @@ +definitions: + config: + /content: + .meta:category: content + /hippo:configuration/hippo:modules/autoexport: + /hippo:moduleconfig: + autoexport:filteruuidpaths: + operation: add + type: string + value: ['/content/uuids'] + autoexport:excluded: + operation: add + type: string + value: ['/content/excluded','/content/excluded/**'] ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/content.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/content.yaml @@ -0,0 +1,2 @@ +/content: + jcr:primaryType: nt:unstructured ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids.yaml @@ -0,0 +1,4 @@ +/content/uuids: + jcr:primaryType: nt:unstructured + jcr:mixinTypes: ['mix:referenceable'] + newProperty: value ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids/child.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids/child.yaml @@ -0,0 +1,4 @@ +/content/uuids/child: + jcr:primaryType: nt:unstructured + jcr:mixinTypes: ['mix:referenceable'] + newProperty: value ===================================== engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-module.yaml ===================================== --- /dev/null +++ b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-module.yaml @@ -0,0 +1,7 @@ +group: + name: hippo-cms-test + after: [hippo-cms, test-group] +project: + name: autoexport-integration-test-project + after: hippo-repository +module: autoexport-integration-test-module View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/109be1c4f501f478ce49cf2bfa582c40aad4f2c3 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/109be1c4f501f478ce49cf2bfa582c40aad4f2c3 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn