svn commit: r1788919 - in /sling/trunk/bundles/extensions/validation/core: pom.xml src/test/java/org/apache/sling/validation/core/it/tests/ValidationTestSupport.java

[olli]

Author: olli
Date: Mon Mar 27 12:17:31 2017
New Revision: 1788919

URL: http://svn.apache.org/viewvc?rev=1788919&view=rev
Log:
SLING-6725 Building validation core fails with test errors

ensure models are installed

Modified:
    sling/trunk/bundles/extensions/validation/core/pom.xml
    
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/core/it/tests/ValidationTestSupport.java

Modified: sling/trunk/bundles/extensions/validation/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/pom.xml?rev=1788919&r1=1788918&r2=1788919&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/pom.xml (original)
+++ sling/trunk/bundles/extensions/validation/core/pom.xml Mon Mar 27 12:17:31 
2017
@@ -141,6 +141,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.resource.presence</artifactId>
+            <version>0.0.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.serviceusermapper</artifactId>
             <version>1.2.0</version>
             <scope>provided</scope>
@@ -221,7 +227,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>5.6.1</version>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
         <!-- Apache Sling -->

Modified: 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/core/it/tests/ValidationTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/core/it/tests/ValidationTestSupport.java?rev=1788919&r1=1788918&r2=1788919&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/core/it/tests/ValidationTestSupport.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/core/it/tests/ValidationTestSupport.java
 Mon Mar 27 12:17:31 2017
@@ -23,13 +23,16 @@ import javax.inject.Inject;
 import org.apache.sling.api.servlets.ServletResolver;
 import org.apache.sling.auth.core.AuthenticationSupport;
 import org.apache.sling.engine.SlingRequestProcessor;
+import org.apache.sling.resource.presence.ResourcePresence;
 import org.apache.sling.testing.paxexam.TestSupport;
 import org.apache.sling.validation.ValidationService;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.util.Filter;
 import org.ops4j.pax.exam.util.PathUtils;
 
 import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionI18n;
+import static 
org.apache.sling.testing.paxexam.SlingOptions.slingExtensionResourcePresence;
 import static 
org.apache.sling.testing.paxexam.SlingOptions.slingInstallerProviderJcr;
 import static 
org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOakTar;
 import static org.ops4j.pax.exam.CoreOptions.composite;
@@ -52,6 +55,10 @@ public class ValidationTestSupport exten
     @Inject
     protected ValidationService validationService;
 
+    @Inject
+    @Filter(value = "(path=/apps/sling/validation/models/model1)")
+    protected ResourcePresence models;
+
     @Configuration
     public Option[] configuration() {
         return new Option[]{
@@ -70,6 +77,9 @@ public class ValidationTestSupport exten
             // testing
             
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
             
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
+            
factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
+                .put("path", "/apps/sling/validation/models/model1")
+                .asOption(),
             junitBundles(),
             logging()
         };
@@ -81,6 +91,7 @@ public class ValidationTestSupport exten
         return composite(
             slingLaunchpadOakTar(workingDirectory, httpPort),
             slingExtensionI18n(),
+            slingExtensionResourcePresence(),
             slingInstallerProviderJcr(),
             
mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").versionAsInProject()
         );