You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/05/06 10:57:16 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated: SLING-7546 Take requirements for services into account
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new e619a5f SLING-7546 Take requirements for services into account
e619a5f is described below
commit e619a5f9aeeb2a40d8cb792fdfbaa08298819567
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun May 6 12:51:07 2018 +0200
SLING-7546 Take requirements for services into account
* remove configuration disabling service requirements
* adjust ITs
---
.../sling/karaf/testing/KarafTestSupport.java | 1 -
.../tests/bootstrap/SlingCommonsCompilerIT.java | 5 +++-
.../karaf/tests/bootstrap/SlingDiscoveryIT.java | 28 ----------------------
.../tests/bootstrap/SlingDiscoveryImplIT.java | 28 ++++++++++++++++++++++
.../karaf/tests/bootstrap/SlingDiscoveryOakIT.java | 28 ++++++++++++++++++++++
.../tests/bootstrap/SlingScriptingJavaIT.java | 5 +++-
.../karaf/tests/bootstrap/SlingScriptingJspIT.java | 5 +++-
.../tests/bootstrap/SlingScriptingSightlyIT.java | 5 +++-
8 files changed, 72 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
index f6e3985..322078d 100644
--- a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
+++ b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
@@ -137,7 +137,6 @@ public abstract class KarafTestSupport {
keepRuntimeFolder(),
editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bundles.regexp", "^PAXEXAM.*$"),
editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j2.rootLogger.level", "DEBUG"),
- editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "serviceRequirements", "disable"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(rmiRegistryPort)),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(rmiServerPort)),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", Integer.toString(sshPort)),
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java
index 97555ab..0225ef0 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java
@@ -39,7 +39,10 @@ public class SlingCommonsCompilerIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-commons-compiler")
+ addSlingFeatures(
+ "sling-commons-fsclassloader",
+ "sling-commons-compiler"
+ )
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
index 4ad447d..326ab75 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
@@ -51,38 +51,10 @@ public class SlingDiscoveryIT extends KarafTestSupport {
}
@Test
- public void testOrgApacheSlingDiscoveryBase() {
- final Bundle bundle = findBundle("org.apache.sling.discovery.base");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheSlingDiscoveryCommons() {
- final Bundle bundle = findBundle("org.apache.sling.discovery.commons");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
public void testOrgApacheSlingDiscoverySupport() {
final Bundle bundle = findBundle("org.apache.sling.discovery.support");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
- @Test
- public void testOrgApacheHttpcomponentsHttpcore() {
- final Bundle bundle = findBundle("org.apache.httpcomponents.httpcore");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheHttpcomponentsHttpclient() {
- final Bundle bundle = findBundle("org.apache.httpcomponents.httpclient");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java
index 3fe7ac9..a426a63 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java
@@ -44,10 +44,38 @@ public class SlingDiscoveryImplIT extends KarafTestSupport {
}
@Test
+ public void testOrgApacheSlingDiscoveryBase() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.base");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheSlingDiscoveryCommons() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.commons");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
public void testOrgApacheSlingDiscoveryImpl() {
final Bundle bundle = findBundle("org.apache.sling.discovery.impl");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
+ @Test
+ public void testOrgApacheHttpcomponentsHttpcore() {
+ final Bundle bundle = findBundle("org.apache.httpcomponents.httpcore");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheHttpcomponentsHttpclient() {
+ final Bundle bundle = findBundle("org.apache.httpcomponents.httpclient");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
index d1cf7f5..56854b4 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
@@ -44,10 +44,38 @@ public class SlingDiscoveryOakIT extends KarafTestSupport {
}
@Test
+ public void testOrgApacheSlingDiscoveryBase() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.base");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheSlingDiscoveryCommons() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.commons");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
public void testOrgApacheSlingDiscoveryOak() {
final Bundle bundle = findBundle("org.apache.sling.discovery.oak");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
+ @Test
+ public void testOrgApacheHttpcomponentsHttpcore() {
+ final Bundle bundle = findBundle("org.apache.httpcomponents.httpcore");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheHttpcomponentsHttpclient() {
+ final Bundle bundle = findBundle("org.apache.httpcomponents.httpclient");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java
index 823d31c..cff5f08 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java
@@ -39,7 +39,10 @@ public class SlingScriptingJavaIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-java")
+ addSlingFeatures(
+ "sling-commons-fsclassloader",
+ "sling-scripting-java"
+ )
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
index 48f05f1..fe947c7 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
@@ -39,7 +39,10 @@ public class SlingScriptingJspIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-jsp")
+ addSlingFeatures(
+ "sling-commons-fsclassloader",
+ "sling-scripting-jsp"
+ )
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingSightlyIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingSightlyIT.java
index 888a523..93ef69a 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingSightlyIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingSightlyIT.java
@@ -39,7 +39,10 @@ public class SlingScriptingSightlyIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-sightly")
+ addSlingFeatures(
+ "sling-commons-fsclassloader",
+ "sling-scripting-sightly"
+ )
);
}
--
To stop receiving notification emails like this one, please contact
olli@apache.org.