Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1366 48198b1b4 -> 5745ba135 (forced update)
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java index a6cb73d..6ee87fb 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java @@ -1 +1,75 @@ -package org.apache.maven.surefire.its.jiras; /* * 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. */ import org.apache.maven.it.VerificationException; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org .apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; /** * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1209} * @since 2.19 */ public class Surefire1209RerunAndForkCountIT extends SurefireJUnit4IntegrationTestCase { @Test public void reusableForksJUnit47() throws VerificationException { unpack().executeTest() .assertTestSuiteResults( 5, 0, 0, 0, 4 ); } @Test public void notReusableForksJUnit47() throws VerificationException { unpack().reuseForks( false ) .executeTest() .assertTestSuiteResults( 5, 0, 0, 0, 4 ); } @Test public void reusableForksJUnit4() throws VerificationException { unpack().addGoal( "-Pjunit4" ) .executeTest() .assertTestSuiteResults( 5, 0, 0, 0, 4 ); } @Test public void notReusableForksJUnit4() throws VerificationException { unpack().addGoal( "-Pjunit4" ) .reuseForks( false ) .executeTest() .assertTestSuiteResults( 5, 0, 0, 0, 4 ); } private SurefireLauncher unpack() { return unpack( "surefire-1209-rerun-and-forkcount" ); } } \ No newline at end of file +package org.apache.maven.surefire.its.jiras; + +/* + * 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. + */ + +import org.apache.maven.it.VerificationException; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireLauncher; +import org.junit.Test; + +/** + * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1209";>SUREFIRE-1209</a> + * @since 2.19 + */ +public class Surefire1209RerunAndForkCountIT + extends SurefireJUnit4IntegrationTestCase +{ + @Test + public void reusableForksJUnit47() + throws VerificationException + { + unpack().executeTest() + .assertTestSuiteResults( 5, 0, 0, 0, 4 ); + } + + @Test + public void notReusableForksJUnit47() + throws VerificationException + { + unpack().reuseForks( false ) + .executeTest() + .assertTestSuiteResults( 5, 0, 0, 0, 4 ); + } + + @Test + public void reusableForksJUnit4() + throws VerificationException + { + unpack().addGoal( "-Pjunit4" ) + .executeTest() + .assertTestSuiteResults( 5, 0, 0, 0, 4 ); + } + + @Test + public void notReusableForksJUnit4() + throws VerificationException + { + unpack().addGoal( "-Pjunit4" ) + .reuseForks( false ) + .executeTest() + .assertTestSuiteResults( 5, 0, 0, 0, 4 ); + } + + private SurefireLauncher unpack() + { + return unpack( "surefire-1209-rerun-and-forkcount" ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java index da69e9d..27b4da8 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java @@ -1 +1,63 @@ -package org.apache.maven.surefire.its.jiras; /* * 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. */ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLaunche r; import org.junit.Test; import static org.apache.commons.lang3.JavaVersion.JAVA_1_7; import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; /** * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1211} * @since 2.19.1 */ public class Surefire1211JUnitTestNgIT extends SurefireJUnit4IntegrationTestCase { @Test public void withJUnit() { assumeJavaVersion( JAVA_1_7 ); unpack().threadCount( 1 ) .executeTest() .verifyErrorFree( 2 ); } @Test public void withoutJUnit() { assumeJavaVersion( JAVA_1_7 ); unpack().threadCount( 1 ) .sysProp( "junit", "false" ) .executeTest() .verifyErrorFree( 1 ); } private SurefireLauncher unpack() { return unpack( "surefire-1211" ); } } \ No newline at end of file +package org.apache.maven.surefire.its.jiras; + +/* + * 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. + */ + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireLauncher; +import org.junit.Test; + +import static org.apache.commons.lang3.JavaVersion.JAVA_1_7; +import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; + +/** + * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1211";>SUREFIRE-1211</a> + * @since 2.19.1 + */ +public class Surefire1211JUnitTestNgIT + extends SurefireJUnit4IntegrationTestCase +{ + + @Test + public void withJUnit() + { + assumeJavaVersion( JAVA_1_7 ); + + unpack().threadCount( 1 ) + .executeTest() + .verifyErrorFree( 2 ); + } + + @Test + public void withoutJUnit() + { + assumeJavaVersion( JAVA_1_7 ); + + unpack().threadCount( 1 ) + .sysProp( "junit", "false" ) + .executeTest() + .verifyErrorFree( 1 ); + } + + private SurefireLauncher unpack() + { + return unpack( "surefire-1211" ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java index 870daf1..c4031c2 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java @@ -1 +1,49 @@ -package org.apache.maven.surefire.its.jiras; /* * 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. */ import org.apache.maven.surefire.its.fixture.*; import org.junit.Test; /** * Added included pattern Tests.java. * <p> * Found in Surefir e 2.19.1. * * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-12-60} * @since 2.20 */ public class Surefire1260NewTestsPattern extends SurefireJUnit4IntegrationTestCase { @Test public void defaultConfig() { unpack() .executeTest() .verifyErrorFree( 5 ); } private SurefireLauncher unpack() { return unpack( "/surefire-1260-new-tests-pattern" ); } } \ No newline at end of file +package org.apache.maven.surefire.its.jiras; + +/* + * 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. + */ + +import org.apache.maven.surefire.its.fixture.*; +import org.junit.Test; + +/** + * Added included pattern Tests.java. + * <p> + * Found in Surefire 2.19.1. + * + * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1260";>SUREFIRE-1260</a> + * @since 2.20 + */ +public class Surefire1260NewTestsPattern + extends SurefireJUnit4IntegrationTestCase +{ + @Test + public void defaultConfig() + { + unpack() + .executeTest() + .verifyErrorFree( 5 ); + } + + private SurefireLauncher unpack() + { + return unpack( "/surefire-1260-new-tests-pattern" ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java index 88c0daa..9e06e8e 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java @@ -25,6 +25,7 @@ import org.junit.Test; import static org.junit.Assume.assumeTrue; +@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } ) /** * IsolatedClassLoader should take platform ClassLoader as a parent ClassLoader if running on the top of JDK9. * The IsolatedClassLoader should not fail like this: @@ -35,7 +36,7 @@ import static org.junit.Assume.assumeTrue; * java.lang.NoClassDefFoundError: java/sql/SQLException: java.sql.SQLException -> [Help 1] * * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> - * @see {@linkplain https://issues.apache.org/jira/browse/SUREFIRE-1265} + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1265";>SUREFIRE-1265</a> * @since 2.20.1 */ public class Surefire1265Java9IT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java index 96efa5a..d6f0a0e 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java @@ -29,7 +29,7 @@ import static org.junit.Assert.fail; /** * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> - * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-649} + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-649";>SUREFIRE-649</a> * @since 2.18 */ public class Surefire649EmptyStringSystemPropertiesIT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java index 7ab1568..215bd5d 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java @@ -26,7 +26,7 @@ import org.junit.Test; /** * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> - * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-817} + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-817";>SUREFIRE-817</a> * @since 2.18 */ public class Surefire817SystemExitIT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java index 9ee7a41..1263ab3 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java @@ -24,7 +24,7 @@ import org.junit.Test; /** * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> - * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-855} + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-855";>SUREFIRE-855</a> * @since 2.19 */ public class Surefire855AllowFailsafeUseArtifactFileIT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java index 2085d93..d776724 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java @@ -25,7 +25,7 @@ import org.junit.Test; /** * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> - * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-995} + * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-995";>SUREFIRE-995</a> * @since 2.18.1 */ public class Surefire995CategoryInheritanceIT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java ---------------------------------------------------------------------- diff --git a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java index 6baa7e3..34a8f83 100644 --- a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java +++ b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java @@ -21,16 +21,13 @@ package org.apache.maven.plugin.surefire.log.api; /** * Allows providers to write console messages on the running maven process. - * <p/> + * <br> * This output is associated with the entire test run and not a specific * test, which means it just goes "straight" to the console "immediately". - * <p/> - * s* <p/> - * <p/> + * <br> * This interface is used in org.apache.maven.plugin.surefire.CommonReflector and reflected * via IsolatedClassLoader which can see classes from JRE only. This interface MUST use * JRE types in method signatures, e.g. {@link String} or {@link Throwable}, etc. - * <p/> */ public interface ConsoleLogger { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java ---------------------------------------------------------------------- diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java index a07caaa..4051e19 100644 --- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java +++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java @@ -24,7 +24,7 @@ import org.junit.runner.notification.Failure; /** * A stacktrace writer that requires at least junit 4.6 to run. Note that we only use this for 4.8 and higher - * <p/> + * <br> * Writes out a specific {@link org.junit.runner.notification.Failure} for * surefire as a stacktrace. * http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java index 8095dbf..56e3e1a 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java @@ -32,7 +32,7 @@ import static org.apache.maven.surefire.junitcore.TestMethod.getThreadTestMethod /** * Handles responses from concurrent junit - * <p/> + * <br> * Stuff to remember about JUnit threading: * parallel=classes; beforeClass/afterClass, constructor and all tests method run on same thread * parallel=methods; beforeClass/afterClass run on main thread, constructor + each test method run on same thread http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java index 9935d9a..ef1d63f 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java @@ -32,7 +32,7 @@ import org.junit.runner.notification.RunListener; * * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> * @since 2.19 - * @see https://github.com/junit-team/junit/issues/1186 + * @see <a href="https://github.com/junit-team/junit/issues/1186";>JUnit issue 1186</a> */ class JUnitCore { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java index 6a7a248..52aec92 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java @@ -117,10 +117,11 @@ public final class JUnitCoreParameters } /** - * @deprecated Instead use the expression ( {@link #isParallelMethods()} && {@link #isParallelClasses()} ). + * @deprecated Instead use the expression isParallelMethods() && isParallelClasses(). + * @return {@code true} if classes and methods are both parallel */ @Deprecated - @SuppressWarnings( { "unused", "deprecation" } ) + @SuppressWarnings( "unused" ) public boolean isParallelBoth() { return isParallelMethods() && isParallelClasses(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java index 98b87ef..e32e32c 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java @@ -32,7 +32,7 @@ import org.junit.runner.notification.Failure; /** * Noteworthy things about JUnit4 listening: - * <p/> + * <br> * A class that is annotated with @Ignore will have one invocation of "testSkipped" with source==name * A method that is annotated with @Ignore will have a invocation of testSkipped with source and name distinct * Methods annotated with @Ignore trigger no further events. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java index ef70027..7bba28c 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicReference; /** * Represents the test-state of a single test method that is run. - * <p/> + * <br> * Notes about thread safety: This instance is serially confined to 1-3 threads (construction, test-run, reporting), * without any actual parallel access */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java index 4f28775..2eaf90a 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; /** * After compiling sources under endorsed junit:4.7, this annotation - * is relocated in {@link org.junit.runner.notification.RunListener.ThreadSafe}. + * is relocated in org.junit.runner.notification.RunListener.ThreadSafe. */ @Documented @Target( ElementType.TYPE ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java index 873ccfd..7e6f933 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java @@ -22,7 +22,7 @@ package org.apache.maven.surefire.junitcore.pc; /** * The Balancer controls the maximum of concurrent threads in the current Scheduler(s) and prevents * from own thread resources exhaustion if other group of schedulers share the same pool of threads. - * <p/> + * <br> * If a permit is available, {@link #acquirePermit()} simply returns and a new test is scheduled * by {@link Scheduler#schedule(Runnable)} in the current runner. Otherwise waiting for a release. * One permit is released as soon as the child thread has finished. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java index e4c36e3..82a9a46 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java @@ -32,6 +32,7 @@ public class BalancerFactory /** * Infinite permits. + * @return Balancer wih infinite permits */ public static Balancer createInfinitePermitsBalancer() { @@ -43,6 +44,7 @@ public class BalancerFactory * Fairness guarantees the waiting schedulers to wake up in order they acquired a permit. * * @param concurrency number of permits to acquire when maintaining concurrency on tests + * @return Balancer with given number of permits */ public static Balancer createBalancer( int concurrency ) { @@ -54,6 +56,7 @@ public class BalancerFactory * Fairness guarantees the waiting schedulers to wake up in order they acquired a permit. * * @param concurrency number of permits to acquire when maintaining concurrency on tests + * @return Balancer with given number of permits */ public static Balancer createBalancerWithFairness( int concurrency ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java index 2afc012..07c21c9 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java @@ -20,7 +20,7 @@ package org.apache.maven.surefire.junitcore.pc; */ /** - * Status of {@link ParallelComputer ParallelComputer runtime}.<p/> + * Status of {@link ParallelComputer ParallelComputer runtime}.<br> * Used together with shutdown hook. * * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java index 0b35765..bd049d9 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java @@ -56,6 +56,7 @@ import static org.apache.maven.surefire.junitcore.pc.Type.CLASSES; import static org.apache.maven.surefire.junitcore.pc.Type.METHODS; import static org.apache.maven.surefire.junitcore.pc.Type.SUITES; +@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } ) /** * Executing suites, classes and methods with defined concurrency. In this example the threads which completed * the suites and classes can be reused in parallel methods. @@ -70,7 +71,7 @@ import static org.apache.maven.surefire.junitcore.pc.Type.SUITES; * Note that the type has always at least one thread even if unspecified. The capacity in * {@link ParallelComputerBuilder#useOnePool(int)} must be greater than the number of concurrent suites and classes * altogether. - * <p/> + * <br> * The Computer can be stopped in a separate thread. Pending tests will be interrupted if the argument is * <tt>true</tt>. * <pre> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java index 3c21409..4e87769 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java @@ -36,10 +36,10 @@ import java.util.concurrent.ThreadPoolExecutor; /** * Schedules tests, controls thread resources, awaiting tests and other schedulers finished, and * a master scheduler can shutdown slaves. - * <p/> + * <br> * The scheduler objects should be first created (and wired) and set in runners * {@link org.junit.runners.ParentRunner#setScheduler(org.junit.runners.model.RunnerScheduler)}. - * <p/> + * <br> * A new instance of scheduling strategy should be passed to the constructor of this scheduler. * * @author Tibor Digana (tibor17) @@ -68,9 +68,13 @@ public class Scheduler /** * Use e.g. parallel classes have own non-shared thread pool, and methods another pool. - * <p/> + * <br> * You can use it with one infinite thread pool shared in strategies across all * suites, class runners, etc. + * + * @param logger console logger + * @param description JUnit description of class + * @param strategy scheduling strategy */ public Scheduler( ConsoleStream logger, Description description, SchedulingStrategy strategy ) { @@ -79,10 +83,10 @@ public class Scheduler /** * Should be used if schedulers in parallel children and parent use one instance of bounded thread pool. - * <p/> + * <br> * Set this scheduler in a e.g. one suite of classes, then every individual class runner should reference - * {@link Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy)} - * or {@link Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy, int)}. + * {@link #Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy)} + * or {@link #Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy, int)}. * * @param logger current logger implementation * @param description description of current runner @@ -98,8 +102,8 @@ public class Scheduler /** * New instances should be used by schedulers with limited concurrency by <tt>balancer</tt> * against other groups of schedulers. The schedulers share one pool. - * <p/> - * Unlike in {@link Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)} which was + * <br> + * Unlike in {@link #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)} which was * limiting the <tt>concurrency</tt> of children of a runner where this scheduler was set, <em>this</em> * <tt>balancer</tt> is limiting the concurrency of all children in runners having schedulers created by this * constructor. @@ -140,11 +144,16 @@ public class Scheduler } /** + * @param logger console logger + * @param description JUnit description of class * @param masterScheduler a reference to - * {@link Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)} - * or {@link Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy)} - * @see Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy) - * @see Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int) + * {@link #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)} + * or {@link #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy)} + * @param strategy scheduling strategy + * @param concurrency determines maximum concurrent children scheduled a time via {@link #schedule(Runnable)} + * + * @see #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy) + * @see #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int) */ public Scheduler( ConsoleStream logger, Description description, Scheduler masterScheduler, SchedulingStrategy strategy, int concurrency ) @@ -157,8 +166,13 @@ public class Scheduler /** * Should be used with individual pools on suites, classes and methods, see * {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder#useSeparatePools()}. - * <p/> + * <br> * Cached thread pool is infinite and can be always shared. + * + * @param logger console logger + * @param description JUnit description of class + * @param masterScheduler parent scheduler + * @param strategy scheduling strategy */ public Scheduler( ConsoleStream logger, Description description, Scheduler masterScheduler, SchedulingStrategy strategy ) @@ -226,7 +240,7 @@ public class Scheduler /** * Attempts to stop all actively executing tasks and immediately returns a collection * of descriptions of those tasks which have started prior to this call. - * <p/> + * <br> * This scheduler and other registered schedulers will stop, see {@link #register(Scheduler)}. * If <tt>shutdownNow</tt> is set, waiting methods will be interrupted via {@link Thread#interrupt}. * http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java index 520c312..b3f80ba 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java @@ -67,7 +67,7 @@ public class SchedulingStrategies /** * The <tt>threadPool</tt> passed to this strategy can be shared in other strategies. - * <p/> + * <br> * The call {@link SchedulingStrategy#finished()} is waiting until own tasks have finished. * New tasks will not be scheduled by this call in this strategy. This strategy is not * waiting for other strategies to finish. The {@link org.junit.runners.model.RunnerScheduler#finished()} may http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java index ce337bc..44fc78f 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java @@ -28,9 +28,9 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * Specifies the strategy of scheduling whether sequential, or parallel. * The strategy may use a thread pool <em>shared</em> with other strategies. - * <p/> + * <br> * One instance of strategy can be used just by one {@link Scheduler}. - * <p/> + * <br> * The strategy is scheduling tasks in {@link #schedule(Runnable)} and awaiting them * completed in {@link #finished()}. Both methods should be used in one thread. * @@ -91,7 +91,7 @@ public abstract class SchedulingStrategy * Stops scheduling new tasks and <em>interrupts</em> running tasks * (e.g. by {@link java.util.concurrent.ExecutorService#shutdownNow()} on a private thread pool * which cannot be <em>shared</em> with other strategy). - * <p/> + * <br> * This method calls {@link #stop()} by default. * * @return <tt>true</tt> if successfully stopped the scheduler, else @@ -105,7 +105,7 @@ public abstract class SchedulingStrategy } /** - * Persistently disables this strategy. Atomically ignores {@link Balancer} to acquire a new permit.<p/> + * Persistently disables this strategy. Atomically ignores {@link Balancer} to acquire a new permit.<br> * The method {@link #canSchedule()} atomically returns {@code false}. * @return {@code true} if {@link #canSchedule()} has return {@code true} on the beginning of this method call. */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java index a0f5c2d..8e61fa3 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java @@ -33,8 +33,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** - * Used to execute tests annotated with {@link net.jcip.annotations.NotThreadSafe}. - * <p/> + * Used to execute tests annotated with net.jcip.annotations.NotThreadSafe. + * <br> * * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> * @see ParallelComputerBuilder http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java index ba45e74..707cc35 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java @@ -23,7 +23,7 @@ import org.junit.runners.ParentRunner; /** * We need to wrap runners in a suite and count children of these runners. - * <p/> + * <br> * Old JUnit versions do not cache children after the first call of * {@link org.junit.runners.ParentRunner#getChildren()}. * Due to performance reasons, the children have to be observed just once. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java index b883d09..eca5f02 100644 --- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java +++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java @@ -27,15 +27,15 @@ import org.junit.runner.notification.Failure; * {@code * TestCase that expose "No tests were executed!" on Test failure using Maven Surefire 2.6-SNAPSHOT * and the JUnit 4.7 Runner. - * <p/> + * <br> * ------------------------------------------------------- * T E S T S * ------------------------------------------------------- - * <p/> + * <br> * Results: - * <p/> + * <br> * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0 - * <p/> + * <br> * [INFO] ------------------------------------------------------------------------ * [INFO] BUILD FAILURE * [INFO] ------------------------------------------------------------------------ @@ -46,15 +46,15 @@ import org.junit.runner.notification.Failure; * [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.5:test * (default-test) on project xxxxxx: No tests were executed! (Set -DfailIfNoTests=false to * ignore this error.) -> [Help 1] - * <p/> - * <p/> + * <br> + * <br> * <dependency> * <groupId>junit</groupId> * <artifactId>junit</artifactId> * <version>4.8.1</version> * <scope>test</scope> * </dependency> - * <p/> + * <br> * <dependency> * <groupId>org.apache.maven.surefire</groupId> * <artifactId>surefire-booter</artifactId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java index 08e1695..7683dc3 100644 --- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java +++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java @@ -27,15 +27,15 @@ import org.junit.runner.notification.Failure; * TestCase that expose "No tests were executed!" on Test failure using Maven Surefire 2.6-SNAPSHOT * and the JUnit 4.8 Runner. * {@code - * * <p/> + * * <br> * ------------------------------------------------------- * T E S T S * ------------------------------------------------------- - * <p/> + * <br> * Results: - * <p/> + * <br> * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0 - * <p/> + * <br> * [INFO] ------------------------------------------------------------------------ * [INFO] BUILD FAILURE * [INFO] ------------------------------------------------------------------------ @@ -46,15 +46,15 @@ import org.junit.runner.notification.Failure; * [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.5:test * (default-test) on project xxxxxx: No tests were executed! (Set -DfailIfNoTests=false to * ignore this error.) -> [Help 1] - * <p/> - * <p/> + * <br> + * <br> * <dependency> * <groupId>junit</groupId> * <artifactId>junit</artifactId> * <version>4.8.1</version> * <scope>test</scope> * </dependency> - * <p/> + * <br> * <dependency> * <groupId>org.apache.maven.surefire</groupId> * <artifactId>surefire-booter</artifactId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java index 3e9ca93..eb5534e 100644 --- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java +++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java @@ -54,7 +54,7 @@ import static junit.framework.Assert.assertEquals; * <version>4.8.1</version> * <scope>test</scope> * </dependency> - * <p/> + * <br> * <dependency> * <groupId>org.apache.maven.surefire</groupId> * <artifactId>surefire-booter</artifactId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java index 812355f..325760f 100644 --- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java +++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; /** * Tests the factories in SchedulingStrategy. - * <p/> + * <br> * Th point of these tests is to check {@link Task#result} if changed * from <code>false</code> to <code>true</code> after all scheduled tasks * have finished. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java index d55c079..2cd2f48 100644 --- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java +++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java @@ -30,7 +30,6 @@ import org.testng.ITestNGMethod; * For internal use only * * @author Olivier Lamy - * @noinspection UnusedDeclaration * @since 2.7.3 */ public class MethodSelector http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java index 956a9d9..dd646b6 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java @@ -28,7 +28,6 @@ import org.testng.internal.IResultListener; * Just like TestNGReporter, but explicitly implements IResultListener; this interface is new in TestNG 5.5 * * @author Dan Fabulich - * @noinspection UnusedDeclaration */ public class ConfigurationAwareTestNGReporter extends TestNGReporter http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java index a8a3837..14e103a 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java @@ -51,7 +51,6 @@ import static org.apache.maven.surefire.util.TestsToRun.fromClass; /** * @author Kristian Rosenvold - * @noinspection UnusedDeclaration */ public class TestNGProvider extends AbstractProvider http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java index d7d5ff9..19cd22d 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java @@ -40,7 +40,6 @@ import static org.apache.maven.surefire.report.SimpleReportEntry.withException; * {@link org.apache.maven.surefire.report.RunListener}. * * @author jkuhnert - * @noinspection ThrowableResultOfMethodCallIgnored */ public class TestNGReporter implements ITestListener, ISuiteListener @@ -50,8 +49,8 @@ public class TestNGReporter /** * Constructs a new instance that will listen to * test updates from a {@link org.testng.TestNG} class instance. - * <p/> - * <p/>It is assumed that the requisite {@link org.testng.TestNG#addListener(ITestListener)} + * <br> + * <br>It is assumed that the requisite {@link org.testng.TestNG#addListener(ITestListener)} * method call has already associated with this instance <i>before</i> the test * suite is run. * http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java index 081b532..9955f44 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java @@ -23,14 +23,14 @@ import org.apache.maven.surefire.booter.ProviderParameterNames; /** * TestNG 4.7 and 5.1 configurator. - * <p/> + * <br> * Allowed options: * -groups * -excludedgroups * -junit (boolean) * -threadcount (int) * -parallel (boolean) - * <p/> + * <br> * * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a> */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java index b003789..ff164fb 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java @@ -22,7 +22,7 @@ package org.apache.maven.surefire.testng.conf; import org.apache.maven.surefire.testset.TestSetFailedException; /** - * TestNG 5.13 configurator. Changed: "reporterslist" need String instead of List<ReporterConfig>. + * TestNG 5.13 configurator. Changed: "reporterslist" need String instead of List<ReporterConfig>. */ public class TestNG513Configurator extends TestNG510Configurator http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java index 5575ccf..15a46a8 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java @@ -24,7 +24,7 @@ import org.apache.maven.surefire.testset.TestSetFailedException; /** * TestNG 5.14.3 configurator. Changed: "reporterslist" replaced by "reporter", - * and "listener" can use String instead of List<Class>. + * and "listener" can use String instead of List<Class>. */ public class TestNG5143Configurator extends TestNG5141Configurator http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java index 28c802f..44da341 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java @@ -23,14 +23,14 @@ import org.apache.maven.surefire.booter.ProviderParameterNames; /** * TestNG 5.2 configurator. - * <p/> + * <br> * Allowed options: * -groups * -excludedgroups * -junit (boolean) * -threadcount (int) * -parallel (String) - * <p/> + * <br> * * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a> */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5745ba13/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java index b819298..18beb70 100755 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java @@ -41,7 +41,7 @@ import static org.apache.maven.surefire.testng.conf.AbstractDirectConfigurator.l * <code>TestNGCommandLineArgs.SKIP_FAILED_INVOCATION_COUNT_OPT</code> which is a <code>Boolean</code>, * <code>TestNGCommandLineArgs.OBJECT_FACTORY_COMMAND_OPT</code> which is a <code>Class</code>, * <code>TestNGCommandLineArgs.REPORTERS_LIST</code> which is a <code>List>ReporterConfig<</code>. - * <p/> + * <br> * Test classes and/or suite files are not passed along as options parameters, but configured separately. * * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
