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 2019/05/26 14:49:25 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated: SLING-8435 Provide Felix Health Check feature
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 c87e1af SLING-8435 Provide Felix Health Check feature
c87e1af is described below
commit c87e1af0a550940646db1d0757bb06526f9ed41d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun May 26 16:48:27 2019 +0200
SLING-8435 Provide Felix Health Check feature
---
...ingHealthcheckIT.java => FelixHealthcheckIT.java} | 20 ++++++++++----------
.../karaf/tests/bootstrap/SlingHealthcheckIT.java | 14 --------------
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java
similarity index 74%
copy from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
copy to src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java
index 54e6dd0..184d928 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java
@@ -34,39 +34,39 @@ import static org.junit.Assert.assertNotNull;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingHealthcheckIT extends KarafTestSupport {
+public class FelixHealthcheckIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-healthcheck")
+ addSlingFeatures("felix-healthcheck")
);
}
@Test
- public void testOrgApacheSlingHealthcheckApi() {
- final Bundle bundle = findBundle("org.apache.sling.hc.api");
+ public void testOrgApacheFelixHealthcheckApi() {
+ final Bundle bundle = findBundle("org.apache.felix.healthcheck.api");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
@Test
- public void testOrgApacheSlingHealthcheckCore() {
- final Bundle bundle = findBundle("org.apache.sling.hc.core");
+ public void testOrgApacheFelixHealthcheckCore() {
+ final Bundle bundle = findBundle("org.apache.felix.healthcheck.core");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
@Test
- public void testOrgApacheSlingHealthcheckSupport() {
- final Bundle bundle = findBundle("org.apache.sling.hc.support");
+ public void testOrgApacheFelixHealthcheckGeneralchecks() {
+ final Bundle bundle = findBundle("org.apache.felix.healthcheck.generalchecks");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
@Test
- public void testOrgApacheSlingHealthcheckWebconsole() {
- final Bundle bundle = findBundle("org.apache.sling.hc.webconsole");
+ public void testOrgApacheFelixHealthcheckWebconsoleplugin() {
+ final Bundle bundle = findBundle("org.apache.felix.healthcheck.webconsoleplugin");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
index 54e6dd0..cc9ad7b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
@@ -51,24 +51,10 @@ public class SlingHealthcheckIT extends KarafTestSupport {
}
@Test
- public void testOrgApacheSlingHealthcheckCore() {
- final Bundle bundle = findBundle("org.apache.sling.hc.core");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
public void testOrgApacheSlingHealthcheckSupport() {
final Bundle bundle = findBundle("org.apache.sling.hc.support");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
- @Test
- public void testOrgApacheSlingHealthcheckWebconsole() {
- final Bundle bundle = findBundle("org.apache.sling.hc.webconsole");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
}