You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2018/06/18 05:09:53 UTC
svn commit: r1833679 -
/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java
Author: tripod
Date: Mon Jun 18 05:09:53 2018
New Revision: 1833679
URL: http://svn.apache.org/viewvc?rev=1833679&view=rev
Log:
JCRVLT-304 Add tests that cover combinations of node and property filters
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java?rev=1833679&r1=1833678&r2=1833679&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java Mon Jun 18 05:09:53 2018
@@ -261,6 +261,60 @@ public class TestFilteredPropertyExport
assertPropertiesMissg("/tmp/foo/bar", "p1");
}
+ @Test
+ public void filterRelativePropertiesDeepNoPropertyFilter() throws IOException, RepositoryException, PackageException {
+ PathFilterSet props = new PathFilterSet("/tmp");
+ PathFilterSet nodes = new PathFilterSet("/tmp");
+
+ DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
+ filter.add(nodes, props);
+
+ File pkgFile = assemblePackage(filter);
+ clean("/tmp");
+ packMgr.open(pkgFile).extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ }
+
+ @Test
+ public void filterRelativePropertiesShallowNoPropertyFilter() throws IOException, RepositoryException, PackageException {
+ PathFilterSet nodes = new PathFilterSet("/tmp");
+ nodes.addInclude(new DefaultPathFilter("/tmp"));
+
+ PathFilterSet props = new PathFilterSet("/tmp");
+
+ DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
+ filter.add(nodes, props);
+ File pkgFile = assemblePackage(filter);
+ clean("/tmp");
+ packMgr.open(pkgFile).extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertNodeMissing("/tmp/foo");
+ assertNodeMissing("/tmp/foo/bar");
+ }
+
+ @Test
+ public void filterRelativePropertiesShallowWithPropertyFilter() throws IOException, RepositoryException, PackageException {
+ PathFilterSet props = new PathFilterSet("/tmp");
+ props.addExclude(new DefaultPathFilter(".*/p1"));
+
+ PathFilterSet nodes = new PathFilterSet("/tmp");
+ nodes.addInclude(new DefaultPathFilter("/tmp"));
+
+ DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
+ filter.add(nodes, props);
+ File pkgFile = assemblePackage(filter);
+ clean("/tmp");
+ packMgr.open(pkgFile).extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p2", "p3");
+ assertPropertiesMissg("/tmp", "p1");
+ assertNodeMissing("/tmp/foo");
+ assertNodeMissing("/tmp/foo/bar");
+ }
/**
* Setup the path /tmp/foo/bar with properties set at each level