This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 666510f9eb380f8ee073fd4daab4b3b806b91dbd Author: Oliver Lietz <[email protected]> AuthorDate: Wed Jul 27 20:33:12 2016 +0000 SLING-5912 Add Integration Tests for non-generated Options git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754343 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 53 +++++++++++++++++++++- .../testing/paxexam/SlingOptionsConfigIT.java | 47 +++++++++++++++++++ .../testing/paxexam/SlingOptionsEventadminIT.java | 47 +++++++++++++++++++ .../sling/testing/paxexam/SlingOptionsHttpIT.java | 47 +++++++++++++++++++ .../paxexam/SlingOptionsHttpWhiteboardIT.java | 47 +++++++++++++++++++ .../testing/paxexam/SlingOptionsManagementIT.java | 47 +++++++++++++++++++ .../sling/testing/paxexam/SlingOptionsScrIT.java | 47 +++++++++++++++++++ .../testing/paxexam/SlingOptionsTestSupport.java | 42 +++++++++++++++++ .../testing/paxexam/SlingOptionsWebconsoleIT.java | 47 +++++++++++++++++++ 9 files changed, 423 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a5f270..773ea75 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,27 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.18.1</version> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + <configuration> + <systemProperties> + <property> + <name>bundle.filename</name> + <value>${basedir}/target/${project.build.finalName}.jar</value> + </property> + </systemProperties> + </configuration> + </plugin> </plugins> </build> @@ -94,7 +115,19 @@ <artifactId>osgi.cmpn</artifactId> <scope>provided</scope> </dependency> - <!-- Pax Exam --> + <!-- Apache Felix --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>5.4.0</version> + <scope>test</scope> + </dependency> + <!-- testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> @@ -105,6 +138,24 @@ <artifactId>pax-exam-cm</artifactId> <version>${org.ops4j.pax.exam.version}</version> </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-forked</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-link-mvn</artifactId> + <version>${org.ops4j.pax.exam.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsConfigIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsConfigIT.java new file mode 100644 index 0000000..9e7f1ee --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsConfigIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.config; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsConfigIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + config() + }; + } + + @Test + public void test() { + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsEventadminIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsEventadminIT.java new file mode 100644 index 0000000..c09b04e --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsEventadminIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.eventadmin; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsEventadminIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + eventadmin() + }; + } + + @Test + public void test() { + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpIT.java new file mode 100644 index 0000000..d48fd0f --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.http; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsHttpIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + http() + }; + } + + @Test + public void test() { + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpWhiteboardIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpWhiteboardIT.java new file mode 100644 index 0000000..8b0e235 --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpWhiteboardIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.httpWhiteboard; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsHttpWhiteboardIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + httpWhiteboard() + }; + } + + @Test + public void test() { + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsManagementIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsManagementIT.java new file mode 100644 index 0000000..45c6748 --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsManagementIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.management; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsManagementIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + management() + }; + } + + @Test + public void test() { + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsScrIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsScrIT.java new file mode 100644 index 0000000..76936c4 --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsScrIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.scr; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsScrIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + scr() + }; + } + + @Test + public void test() { + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java new file mode 100644 index 0000000..f682a30 --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java @@ -0,0 +1,42 @@ +/* + * 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.testing.paxexam; + + +import org.ops4j.pax.exam.CoreOptions; +import org.ops4j.pax.exam.Option; + +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.keepCaches; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; + +public abstract class SlingOptionsTestSupport extends TestSupport { + + @Override + protected Option baseConfiguration() { + return composite( + localMavenRepo(), + systemProperty("pax.exam.osgi.unresolved.fail").value("true"), + keepCaches(), + CoreOptions.workingDirectory(workingDirectory()), + testBundle("bundle.filename") + ); + } + +} diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsWebconsoleIT.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsWebconsoleIT.java new file mode 100644 index 0000000..d545fcd --- /dev/null +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsWebconsoleIT.java @@ -0,0 +1,47 @@ +/* + * 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.testing.paxexam; + +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.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import static org.apache.sling.testing.paxexam.SlingOptions.webconsole; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class SlingOptionsWebconsoleIT extends SlingOptionsTestSupport { + + @Configuration + public Option[] configuration() { + return new Option[]{ + baseConfiguration(), + webconsole() + }; + } + + @Test + public void test() { + } + +} -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
