This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git
commit 9c9239ba61b3a0be1ab65ded040c56ec3659e699 Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Fri Mar 11 16:28:09 2011 +0000 SLING-2027 - SlingRemoteTestParameters: make tests count check optional git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1080639 13f79535-47bb-0310-9956-ffa450edef68 --- .../testrunner/SlingRemoteTestParameters.java | 5 ---- .../remote/testrunner/SlingRemoteTestRunner.java | 10 +++----- ...Parameters.java => SlingTestsCountChecker.java} | 27 ++++++---------------- 3 files changed, 10 insertions(+), 32 deletions(-) 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 @@ public interface SlingRemoteTestParameters { * 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 @@ public class SlingRemoteTestRunner extends ParentRunner<SlingRemoteTest> { 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/SlingRemoteTestParameters.java b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java similarity index 55% copy from src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java copy to src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java index 69d83ea..31bdb37 100644 --- a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java +++ b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java @@ -16,25 +16,12 @@ */ package org.apache.sling.junit.remote.testrunner; -/** Test class "proxies" implement this to indicate where to - * run the tests. +/** 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 SlingRemoteTestParameters { - /** Return the URL of the JUnit servlet */ - String getJunitServletUrl(); - - /** Return the optional selector for the test classes to run, - * for example "org.apache.sling.testing.samples.sampletests.JUnit4Test" - */ - String getTestClassesSelector(); - - /** Return the optional selector for the test methods to run, - * for example "someMethodName" - */ - String getTestMethodSelector(); - - /** Return the expected number of tests - if zero, no check - * is done. - */ - int getExpectedNumberOfTests(); +public interface SlingTestsCountChecker { + void checkNumberOfTests(int numberOfTestsExecuted); } -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.