SLING-2027 - SlingRemoteTestParameters: make tests count check optional
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1080639 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
index 69d83ea..7dd7944 100644
--- a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
+++ b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
@@ -32,9 +32,4 @@
* for example "someMethodName"
*/
String getTestMethodSelector();
-
- /** Return the expected number of tests - if zero, no check
- * is done.
- */
- int getExpectedNumberOfTests();
}
diff --git a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
index 8399d95..175b774 100644
--- a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
+++ b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
@@ -16,8 +16,6 @@
*/
package org.apache.sling.junit.remote.testrunner;
-import static org.junit.Assert.assertEquals;
-
import java.util.LinkedList;
import java.util.List;
@@ -96,11 +94,9 @@
log.info("Server-side tests executed at {} with path {}",
testParameters.getJunitServletUrl(), testHttpClient.getTestExecutionPath());
- // Check that number of tests is as expected
- if(testParameters.getExpectedNumberOfTests() >= 0) {
- assertEquals("Expecting " + testParameters.getExpectedNumberOfTests() + " tests",
- testParameters.getExpectedNumberOfTests(),
- children.size());
+ // Optionally check that number of tests is as expected
+ if(testParameters instanceof SlingTestsCountChecker) {
+ ((SlingTestsCountChecker)testParameters).checkNumberOfTests(children.size());
}
}
diff --git a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java
new file mode 100644
index 0000000..31bdb37
--- /dev/null
+++ b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java
@@ -0,0 +1,27 @@
+/*
+ * 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.junit.remote.testrunner;
+
+/** Tests classes can implement this interface to check the
+ * number of tests that are executed remotely. This is useful
+ * when tests are loaded dynamically, to check that all the required
+ * tests have indeed been executed, for example in continuous
+ * integration.
+ */
+public interface SlingTestsCountChecker {
+ void checkNumberOfTests(int numberOfTestsExecuted);
+}
