You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2015/04/14 18:31:35 UTC
svn commit: r1673463 - in
/sling/trunk/bundles/extensions/validation/core/src:
main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
Author: kwin
Date: Tue Apr 14 16:31:34 2015
New Revision: 1673463
URL: http://svn.apache.org/r1673463
Log:
SLING-4609 fix faulty commit
Modified:
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java?rev=1673463&r1=1673462&r2=1673463&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Tue Apr 14 16:31:34 2015
@@ -132,7 +132,7 @@ public class ValidationServiceImpl imple
@Override
public @Nonnull ValidationResult validate(@Nonnull Resource resource, @Nonnull ValidationModel model) {
- return new ValidationResultImpl(); //validate(resource, model, "");
+ return validate(resource, model, "");
}
protected @Nonnull ValidationResult validate(@Nonnull Resource resource, @Nonnull ValidationModel model, @Nonnull String relativePath) {
Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java?rev=1673463&r1=1673462&r2=1673463&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java Tue Apr 14 16:31:34 2015
@@ -491,7 +491,7 @@ public class ValidationServiceImplTest {
Assert.assertNotNull("Could not find validation model for 'sling/validation/test'", vm);
ValidationResult vr = validationService.validate(testResource, vm);
- assertFalse(vr.isValid());
+ assertFalse("resource should have been considered invalid", vr.isValid());
assertThat(vr.getFailureMessages(), Matchers.hasKey("child1/grandChild1/hello"));
assertThat(vr.getFailureMessages().keySet(), Matchers.hasSize(1));
}