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 2021/08/12 13:10:21 UTC
[sling-org-apache-sling-event] 05/08: rename integration tests from
*Test to *IT and remove obsolete configurations
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-event.git
commit e55d5792956b207b42ffd919405ba97747112a2e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 12 14:52:34 2021 +0200
rename integration tests from *Test to *IT and remove obsolete configurations
---
pom.xml | 8 --------
.../{AbstractJobHandlingTest.java => AbstractJobHandlingIT.java} | 2 +-
.../{AbstractMaxParallelTest.java => AbstractMaxParallelIT.java} | 2 +-
.../org/apache/sling/event/it/{ChaosTest.java => ChaosIT.java} | 2 +-
.../sling/event/it/{ClassloadingTest.java => ClassloadingIT.java} | 2 +-
.../apache/sling/event/it/{HistoryTest.java => HistoryIT.java} | 2 +-
.../sling/event/it/{JobHandlingTest.java => JobHandlingIT.java} | 2 +-
.../it/{OrderedMaxParallelTest.java => OrderedMaxParallelIT.java} | 2 +-
.../sling/event/it/{OrderedQueueTest.java => OrderedQueueIT.java} | 2 +-
...oundRobinMaxParallelTest.java => RoundRobinMaxParallelIT.java} | 2 +-
.../event/it/{RoundRobinQueueTest.java => RoundRobinQueueIT.java} | 2 +-
.../sling/event/it/{SchedulingTest.java => SchedulingIT.java} | 2 +-
.../sling/event/it/{TimedJobsTest.java => TimedJobsIT.java} | 2 +-
.../event/it/{TopicMatchingTest.java => TopicMatchingIT.java} | 2 +-
.../event/it/{UnorderedQueueTest.java => UnorderedQueueIT.java} | 2 +-
15 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 177f82a..2b94da1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,6 @@
<!-- plain unit tests -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/it/**</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -110,9 +105,6 @@
<systemPropertyVariables combine.children="append">
<bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
</systemPropertyVariables>
- <includes>
- <include>**/it/*</include>
- </includes>
</configuration>
</plugin>
<plugin>
diff --git a/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java b/src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java
similarity index 98%
rename from src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
rename to src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java
index 8eb6572..37ef291 100644
--- a/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
+++ b/src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java
@@ -38,7 +38,7 @@ import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
-public abstract class AbstractJobHandlingTest extends JobsTestSupport {
+public abstract class AbstractJobHandlingIT extends JobsTestSupport {
protected static final int DEFAULT_TEST_TIMEOUT = 1000*60*5;
diff --git a/src/test/java/org/apache/sling/event/it/AbstractMaxParallelTest.java b/src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/AbstractMaxParallelTest.java
rename to src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java
index 407fc80..b8afedf 100644
--- a/src/test/java/org/apache/sling/event/it/AbstractMaxParallelTest.java
+++ b/src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java
@@ -49,7 +49,7 @@ import org.osgi.service.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class AbstractMaxParallelTest extends AbstractJobHandlingTest {
+public abstract class AbstractMaxParallelIT extends AbstractJobHandlingIT {
private static final int BACKGROUND_LOAD_DELAY_SECONDS = 1;
diff --git a/src/test/java/org/apache/sling/event/it/ChaosTest.java b/src/test/java/org/apache/sling/event/it/ChaosIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/ChaosTest.java
rename to src/test/java/org/apache/sling/event/it/ChaosIT.java
index ae8c245..bdbf656 100644
--- a/src/test/java/org/apache/sling/event/it/ChaosTest.java
+++ b/src/test/java/org/apache/sling/event/it/ChaosIT.java
@@ -59,7 +59,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class ChaosTest extends AbstractJobHandlingTest {
+public class ChaosIT extends AbstractJobHandlingIT {
/** Duration for firing jobs in seconds. */
private static final long DURATION = 1 * 60;
diff --git a/src/test/java/org/apache/sling/event/it/ClassloadingTest.java b/src/test/java/org/apache/sling/event/it/ClassloadingIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/ClassloadingTest.java
rename to src/test/java/org/apache/sling/event/it/ClassloadingIT.java
index d03ed6c..2214ab3 100644
--- a/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
+++ b/src/test/java/org/apache/sling/event/it/ClassloadingIT.java
@@ -53,7 +53,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class ClassloadingTest extends AbstractJobHandlingTest {
+public class ClassloadingIT extends AbstractJobHandlingIT {
private static final int CONDITION_INTERVAL_MILLIS = 50;
private static final int CONDITION_TIMEOUT_SECONDS = 5;
diff --git a/src/test/java/org/apache/sling/event/it/HistoryTest.java b/src/test/java/org/apache/sling/event/it/HistoryIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/HistoryTest.java
rename to src/test/java/org/apache/sling/event/it/HistoryIT.java
index 37f0038..5c1895c 100644
--- a/src/test/java/org/apache/sling/event/it/HistoryTest.java
+++ b/src/test/java/org/apache/sling/event/it/HistoryIT.java
@@ -44,7 +44,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class HistoryTest extends AbstractJobHandlingTest {
+public class HistoryIT extends AbstractJobHandlingIT {
private static final String TOPIC = "sling/test/history";
diff --git a/src/test/java/org/apache/sling/event/it/JobHandlingTest.java b/src/test/java/org/apache/sling/event/it/JobHandlingIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/JobHandlingTest.java
rename to src/test/java/org/apache/sling/event/it/JobHandlingIT.java
index dea7c32..99a6bc4 100644
--- a/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
+++ b/src/test/java/org/apache/sling/event/it/JobHandlingIT.java
@@ -56,7 +56,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class JobHandlingTest extends AbstractJobHandlingTest {
+public class JobHandlingIT extends AbstractJobHandlingIT {
public static final String TOPIC = "sling/test";
diff --git a/src/test/java/org/apache/sling/event/it/OrderedMaxParallelTest.java b/src/test/java/org/apache/sling/event/it/OrderedMaxParallelIT.java
similarity index 97%
rename from src/test/java/org/apache/sling/event/it/OrderedMaxParallelTest.java
rename to src/test/java/org/apache/sling/event/it/OrderedMaxParallelIT.java
index 958f891..a861804 100644
--- a/src/test/java/org/apache/sling/event/it/OrderedMaxParallelTest.java
+++ b/src/test/java/org/apache/sling/event/it/OrderedMaxParallelIT.java
@@ -34,7 +34,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class OrderedMaxParallelTest extends AbstractMaxParallelTest {
+public class OrderedMaxParallelIT extends AbstractMaxParallelIT {
private static final int DURATION = 40;
diff --git a/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java b/src/test/java/org/apache/sling/event/it/OrderedQueueIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
rename to src/test/java/org/apache/sling/event/it/OrderedQueueIT.java
index 5f7a18a..13222a6 100644
--- a/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
+++ b/src/test/java/org/apache/sling/event/it/OrderedQueueIT.java
@@ -48,7 +48,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class OrderedQueueTest extends AbstractJobHandlingTest {
+public class OrderedQueueIT extends AbstractJobHandlingIT {
@Configuration
public Option[] configuration() {
diff --git a/src/test/java/org/apache/sling/event/it/RoundRobinMaxParallelTest.java b/src/test/java/org/apache/sling/event/it/RoundRobinMaxParallelIT.java
similarity index 97%
rename from src/test/java/org/apache/sling/event/it/RoundRobinMaxParallelTest.java
rename to src/test/java/org/apache/sling/event/it/RoundRobinMaxParallelIT.java
index b1b6494..2f731f4 100644
--- a/src/test/java/org/apache/sling/event/it/RoundRobinMaxParallelTest.java
+++ b/src/test/java/org/apache/sling/event/it/RoundRobinMaxParallelIT.java
@@ -34,7 +34,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class RoundRobinMaxParallelTest extends AbstractMaxParallelTest {
+public class RoundRobinMaxParallelIT extends AbstractMaxParallelIT {
private static final int MAX_PARALLEL = 3;
diff --git a/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java b/src/test/java/org/apache/sling/event/it/RoundRobinQueueIT.java
similarity index 98%
rename from src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
rename to src/test/java/org/apache/sling/event/it/RoundRobinQueueIT.java
index 36ab986..2aa95ea 100644
--- a/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
+++ b/src/test/java/org/apache/sling/event/it/RoundRobinQueueIT.java
@@ -49,7 +49,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class RoundRobinQueueTest extends AbstractJobHandlingTest {
+public class RoundRobinQueueIT extends AbstractJobHandlingIT {
private static final String QUEUE_NAME = "roundrobintest";
private static final String TOPIC = "sling/roundrobintest";
diff --git a/src/test/java/org/apache/sling/event/it/SchedulingTest.java b/src/test/java/org/apache/sling/event/it/SchedulingIT.java
similarity index 98%
rename from src/test/java/org/apache/sling/event/it/SchedulingTest.java
rename to src/test/java/org/apache/sling/event/it/SchedulingIT.java
index d0156f1..c13b57b 100644
--- a/src/test/java/org/apache/sling/event/it/SchedulingTest.java
+++ b/src/test/java/org/apache/sling/event/it/SchedulingIT.java
@@ -41,7 +41,7 @@ import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class SchedulingTest extends AbstractJobHandlingTest {
+public class SchedulingIT extends AbstractJobHandlingIT {
private static final String TOPIC = "job/scheduled/topic";
diff --git a/src/test/java/org/apache/sling/event/it/TimedJobsTest.java b/src/test/java/org/apache/sling/event/it/TimedJobsIT.java
similarity index 97%
rename from src/test/java/org/apache/sling/event/it/TimedJobsTest.java
rename to src/test/java/org/apache/sling/event/it/TimedJobsIT.java
index 2d937d5..c3fa36f 100644
--- a/src/test/java/org/apache/sling/event/it/TimedJobsTest.java
+++ b/src/test/java/org/apache/sling/event/it/TimedJobsIT.java
@@ -38,7 +38,7 @@ import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class TimedJobsTest extends AbstractJobHandlingTest {
+public class TimedJobsIT extends AbstractJobHandlingIT {
private static final String TOPIC = "timed/test/topic";
diff --git a/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java b/src/test/java/org/apache/sling/event/it/TopicMatchingIT.java
similarity index 98%
rename from src/test/java/org/apache/sling/event/it/TopicMatchingTest.java
rename to src/test/java/org/apache/sling/event/it/TopicMatchingIT.java
index 0a6ac5b..35d4266 100644
--- a/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java
+++ b/src/test/java/org/apache/sling/event/it/TopicMatchingIT.java
@@ -39,7 +39,7 @@ import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class TopicMatchingTest extends AbstractJobHandlingTest {
+public class TopicMatchingIT extends AbstractJobHandlingIT {
public static final String TOPIC = "sling/test/a";
diff --git a/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java b/src/test/java/org/apache/sling/event/it/UnorderedQueueIT.java
similarity index 99%
rename from src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
rename to src/test/java/org/apache/sling/event/it/UnorderedQueueIT.java
index 7a8104a..11f5c12 100644
--- a/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
+++ b/src/test/java/org/apache/sling/event/it/UnorderedQueueIT.java
@@ -49,7 +49,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
-public class UnorderedQueueTest extends AbstractJobHandlingTest {
+public class UnorderedQueueIT extends AbstractJobHandlingIT {
private static final String QUEUE_NAME = "unorderedtestqueue";
private static final String TOPIC = "sling/unorderedtest";