You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/01/08 08:17:58 UTC

[jackrabbit-filevault] branch master updated: improve tests for invalid filter.xml

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


The following commit(s) were added to refs/heads/master by this push:
     new f323324  improve tests for invalid filter.xml
     new 960866a  Merge branch 'master' of git@github.com:apache/jackrabbit-filevault.git
f323324 is described below

commit f323324e6f870e2b014d87ab881b5d6e010417e0
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 8 09:17:31 2021 +0100

    improve tests for invalid filter.xml
---
 .../vault/fs/config/DefaultWorkspaceFilter.java         | 12 ++++++++----
 .../spi/impl/AdvancedFilterValidatorTest.java           | 17 ++++++++++++++---
 .../resources/invalid-package/META-INF/vault/filter.xml |  5 ++++-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java
index 08799b1..2832e2c 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java
@@ -423,10 +423,14 @@ public class DefaultWorkspaceFilter implements Dumpable, WorkspaceFilter {
         // check for import mode
         String mode = elem.getAttribute("mode");
         if (mode != null && mode.length() > 0) {
-            ImportMode importMode = ImportMode.valueOf(mode.toUpperCase());
-            nodeFilters.setImportMode(importMode);
-            propFilters.setImportMode(importMode);
-            bothFilters.setImportMode(importMode);
+            try {
+                ImportMode importMode = ImportMode.valueOf(mode.toUpperCase());
+                nodeFilters.setImportMode(importMode);
+                propFilters.setImportMode(importMode);
+                bothFilters.setImportMode(importMode);
+            } catch (IllegalArgumentException e) {
+                throw new ConfigurationException("Invalid value given for attribute 'mode'", e);
+            }
         }
         String type = elem.getAttribute("type");
         if (type != null && type.length() > 0) {
diff --git a/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java b/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
index 1c3406f..6d2ff46 100644
--- a/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
+++ b/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
@@ -51,8 +51,6 @@ import org.apache.jackrabbit.vault.validation.spi.FilterValidator;
 import org.apache.jackrabbit.vault.validation.spi.NodeContext;
 import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
 import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
-import org.apache.jackrabbit.vault.validation.spi.impl.AdvancedFilterValidator;
-import org.apache.jackrabbit.vault.validation.spi.impl.AdvancedFilterValidatorFactory;
 import org.apache.jackrabbit.vault.validation.spi.util.NodeContextImpl;
 import org.junit.Assert;
 import org.junit.Before;
@@ -384,14 +382,27 @@ public class AdvancedFilterValidatorTest {
             Collection<ValidationMessage> messages = validator.validateMetaInfData(input, Paths.get("vault/filter.xml"), Paths.get(""));
             ValidationExecutorTest.assertViolation(messages,
                     new ValidationMessage(ValidationMessageSeverity.WARN,
+                            "cvc-enumeration-valid: Value 'invalid' is not facet-valid with respect to enumeration '[replace, merge, update]'. It must be a value from the enumeration.", 19, 49, null),
+                    new ValidationMessage(ValidationMessageSeverity.WARN,
+                        "cvc-attribute.3: The value 'invalid' of attribute 'mode' on element 'filter' is not valid with respect to its type, 'null'.", 19, 49, null), // unclear why type is 'null'
+                    new ValidationMessage(ValidationMessageSeverity.WARN,
                             "cvc-complex-type.3.2.2: Attribute 'mode' is not allowed to appear in element 'exclude'.", 20, 51, null),
                     new ValidationMessage(ValidationMessageSeverity.WARN,
                             "cvc-complex-type.2.4.a: Invalid content was found starting with element 'invalidelement'. One of '{exclude, include}' is expected.",
                             22, 27, null),
+                    new ValidationMessage(ValidationMessageSeverity.WARN,
+                            "cvc-complex-type.4: Attribute 'root' must appear on element 'filter'.",
+                            24, 13, null),
+                    new ValidationMessage(ValidationMessageSeverity.WARN,
+                            "cvc-complex-type.3.2.2: Attribute 'root' is not allowed to appear in element 'include'.",
+                            25, 27, null),
+                    new ValidationMessage(ValidationMessageSeverity.WARN,
+                            "cvc-complex-type.4: Attribute 'pattern' must appear on element 'include'.",
+                            25, 27, null),
                     new ValidationMessage(ValidationMessageSeverity.WARN, AdvancedFilterValidator.MESSAGE_INVALID_FILTER_XML)); // because
                                                                                                                                 // of
                                                                                                                                 // invalid
-                                                                                                                                // regex
+                                                                                                                                // mode value
         }
     }
 
diff --git a/vault-validation/src/test/resources/invalid-package/META-INF/vault/filter.xml b/vault-validation/src/test/resources/invalid-package/META-INF/vault/filter.xml
index e4648ef..a4f1610 100644
--- a/vault-validation/src/test/resources/invalid-package/META-INF/vault/filter.xml
+++ b/vault-validation/src/test/resources/invalid-package/META-INF/vault/filter.xml
@@ -16,9 +16,12 @@
   limitations under the License.
   -->
 <workspaceFilter version="1.0">
-    <filter root="/etc/project1">
+    <filter root="/etc/project1" mode="invalid">
         <exclude pattern=".*\.gif" mode="merge" />
         <include pattern="["/> <!-- invalid regex -->
         <invalidelement />
     </filter>
+    <filter>
+        <include root=""/>
+    </filter>
 </workspaceFilter>
\ No newline at end of file