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 2020/04/10 13:40:54 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated (b5847fa -> 638e447)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.
from b5847fa remove unused dependencies
new 7b9a7cf SLING-9357 Provide Installer Factory Configuration feature
new 638e447 SLING-9358 Provide Installer Factory Packages feature
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...althcheckIT.java => SlingInstallerFactoryConfigurationIT.java} | 8 ++++----
...lerHealthcheckIT.java => SlingInstallerFactoryPackagesIT.java} | 8 ++++----
.../org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java | 7 -------
3 files changed, 8 insertions(+), 15 deletions(-)
copy src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingInstallerHealthcheckIT.java => SlingInstallerFactoryConfigurationIT.java} (87%)
copy src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingInstallerHealthcheckIT.java => SlingInstallerFactoryPackagesIT.java} (88%)
[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-9358
Provide Installer Factory Packages feature
Posted by ol...@apache.org.
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
commit 638e4478db02a5a0fc73c825726dcbfc820775eb
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 10 15:20:56 2020 +0200
SLING-9358 Provide Installer Factory Packages feature
---
.../bootstrap/SlingInstallerFactoryPackagesIT.java | 53 ++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java
new file mode 100644
index 0000000..7e59909
--- /dev/null
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.karaf.tests.bootstrap;
+
+import org.apache.sling.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingInstallerFactoryPackagesIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addSlingFeatures("sling-installer-factory-packages")
+ );
+ }
+
+ @Test
+ public void testOrgApacheSlingInstallerFactoryConfiguration() {
+ final Bundle bundle = findBundle("org.apache.sling.installer.factory.packages");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+}
[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-9357
Provide Installer Factory Configuration feature
Posted by ol...@apache.org.
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
commit 7b9a7cf1999f4ecda46ee17fc1c69988e422e41f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 10 15:19:23 2020 +0200
SLING-9357 Provide Installer Factory Configuration feature
---
....java => SlingInstallerFactoryConfigurationIT.java} | 18 ++----------------
.../sling/karaf/tests/bootstrap/SlingInstallerIT.java | 7 -------
2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java
similarity index 75%
copy from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
copy to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java
index 9b02365..5fbb946 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java
@@ -34,30 +34,16 @@ import static org.junit.Assert.assertNotNull;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingInstallerIT extends KarafTestSupport {
+public class SlingInstallerFactoryConfigurationIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer")
+ addSlingFeatures("sling-installer-factory-configuration")
);
}
@Test
- public void testOrgApacheSlingInstallerConsole() {
- final Bundle bundle = findBundle("org.apache.sling.installer.console");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheSlingInstallerCore() {
- final Bundle bundle = findBundle("org.apache.sling.installer.core");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
public void testOrgApacheSlingInstallerFactoryConfiguration() {
final Bundle bundle = findBundle("org.apache.sling.installer.factory.configuration");
assertNotNull(bundle);
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
index 9b02365..077c8d7 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
@@ -57,11 +57,4 @@ public class SlingInstallerIT extends KarafTestSupport {
assertEquals(Bundle.ACTIVE, bundle.getState());
}
- @Test
- public void testOrgApacheSlingInstallerFactoryConfiguration() {
- final Bundle bundle = findBundle("org.apache.sling.installer.factory.configuration");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
}