You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2017/05/01 12:22:24 UTC
[4/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc
fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
index 9b27c1c..9eccf6b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
@@ -26,13 +26,13 @@ import org.apache.maven.surefire.testset.TestSetFailedException;
/**
* Interface to be implemented by all Surefire providers.
- * <p/>
+ * <br>
* NOTE: This class is part of the proposed public api for surefire providers for 2.7. It may
* still be subject to changes, even for minor revisions.
- * <p/>
+ * <br>
* The api covers this interface and all the types reachable from it. And nothing else.
- * <p/>
- * <p/>
+ * <br>
+ * <br>
* Called in one of three ways:
* Forkmode = never: getSuites is not called, invoke is called with null parameter
* Forkmode = once: getSuites is not called, invoke is called with null parameter
@@ -45,7 +45,7 @@ public interface SurefireProvider
{
/**
* Determines the number of forks.
- * <p/>
+ * <br>
* Called when forkmode is different from "never" or "always", allows the provider to define
* how to behave for the fork.
*
@@ -64,6 +64,7 @@ public interface SurefireProvider
* When reporting fails
* @throws org.apache.maven.surefire.testset.TestSetFailedException
* When testset fails
+ * @throws InvocationTargetException fails in {@code ProviderFactory}
*/
@SuppressWarnings( "checkstyle:redundantthrows" )
RunResult invoke( Object forkTestSet )
@@ -72,14 +73,14 @@ public interface SurefireProvider
/**
* Makes an attempt at cancelling the current run, giving the provider a chance to notify
* reporting that the remaining tests have been cancelled due to timeout.
- * <p/>
+ * <br>
* If the provider thinks it can terminate properly it is the responsibility of
* the invoke method to return a RunResult with a booter code of failure.
- * <p/>
+ * <br>
* It is up to the provider to find out how to implement this method properly.
* A provider may also choose to not do anything at all in this method,
* which means surefire will kill the forked process soon afterwards anyway.
- * <p/>
+ * <br>
* Will be called on a different thread than the one calling invoke.
*/
// Todo: Need to think a lot closer about how/if this works and if there is a use case for it.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index 28f111b..d4af679 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -29,7 +29,7 @@ import static org.apache.maven.surefire.util.internal.StringUtils.NL;
/**
* Deals with system.out/err.
- * <p/>
+ * <br>
*/
public class ConsoleOutputCapture
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
index 88552cb..dee095c 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
@@ -29,7 +29,6 @@ import java.io.StringWriter;
* Write the trace out for a POJO test. Java 1.5 compatible.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @noinspection ThrowableResultOfMethodCallIgnored
*/
public class LegacyPojoStackTraceWriter
implements StackTraceWriter
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
index 2bc3fcd..ec0f782 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
@@ -55,8 +55,9 @@ public interface ReportEntry
/**
* Gets the runtime for the item. Optional parameter. If the value is not set, it will be determined within
- * the reporting subsustem. Some providers like to calculate this value themselves, and it gets the
+ * the reporting subsystem. Some providers like to calculate this value themselves, and it gets the
* most accurate value.
+ * @return duration of a test in milli seconds
*/
Integer getElapsed();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
index 5238473..d2bfb13 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
@@ -24,7 +24,7 @@ import java.io.PrintStream;
/**
* Bits and pieces of reporting configuration that seem to be necessary on the provider side.
- * <p/>
+ * <br>
* Todo: Consider moving these fields elsewhere, this concept does not smell too good
*
* @author Kristian Rosenvold
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
index b964430..22cda61 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.report;
/**
* Used by providers to report results.
* Using this interface integrates the providers together into a common reporting infrastructure.
- * <p/>
+ * <br>
* An instance of a reporter is not guaranteed to be thread-safe and concurrent test frameworks
* must request an instance of a reporter per-thread from the ReporterFactory.
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
index 28a19f9..0dd4264 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
@@ -161,9 +161,6 @@ public class SimpleReportEntry
return message;
}
- /**
- * @noinspection RedundantIfStatement
- */
@Override
public boolean equals( Object o )
{
@@ -177,27 +174,7 @@ public class SimpleReportEntry
}
SimpleReportEntry that = (SimpleReportEntry) o;
-
- if ( elapsed != null ? !elapsed.equals( that.elapsed ) : that.elapsed != null )
- {
- return false;
- }
- if ( name != null ? !name.equals( that.name ) : that.name != null )
- {
- return false;
- }
- if ( source != null ? !source.equals( that.source ) : that.source != null )
- {
- return false;
- }
- if ( stackTraceWriter != null
- ? !stackTraceWriter.equals( that.stackTraceWriter )
- : that.stackTraceWriter != null )
- {
- return false;
- }
-
- return true;
+ return isElapsedTimeEqual( that ) && isNameEqual( that ) && isSourceEqual( that ) && isStackEqual( that );
}
@Override
@@ -215,4 +192,24 @@ public class SimpleReportEntry
{
return getName();
}
+
+ private boolean isElapsedTimeEqual( SimpleReportEntry en )
+ {
+ return elapsed != null ? elapsed.equals( en.elapsed ) : en.elapsed == null;
+ }
+
+ private boolean isNameEqual( SimpleReportEntry en )
+ {
+ return name != null ? name.equals( en.name ) : en.name == null;
+ }
+
+ private boolean isSourceEqual( SimpleReportEntry en )
+ {
+ return source != null ? source.equals( en.source ) : en.source == null;
+ }
+
+ private boolean isStackEqual( SimpleReportEntry en )
+ {
+ return stackTraceWriter != null ? stackTraceWriter.equals( en.stackTraceWriter ) : en.stackTraceWriter == null;
+ }
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
index aa099c8..e318e1f 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
@@ -24,7 +24,7 @@ import java.io.PrintWriter;
/**
* Represents a test-run-result; this may be from a single test run or an aggregated result.
- * <p/>
+ * <br>
* In the case of timeout==true, the run-counts reflect the state of the test-run at the time
* of the timeout.
*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
index 8e46ccb..56bc279 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
@@ -73,12 +73,12 @@ public final class ResolvedTest
/**
* '*' means zero or more characters<br>
* '?' means one and only one character
- * The pattern %regex[] prefix and suffix does not appear. The regex <code>pattern</code> is always
+ * The pattern %regex[] prefix and suffix does not appear. The regex <i>pattern</i> is always
* unwrapped by the caller.
*
* @param classPattern test class file pattern
* @param methodPattern test method
- * @param isRegex {@code true} if regex
+ * @param isRegex {@code true} if pattern is regex
*/
public ResolvedTest( String classPattern, String methodPattern, boolean isRegex )
{
@@ -104,7 +104,11 @@ public final class ResolvedTest
}
/**
- * The regex <code>pattern</code> is always unwrapped.
+ * The regex {@code pattern} is always unwrapped.
+ *
+ * @param type class or method
+ * @param pattern pattern or regex
+ * @param isRegex {@code true} if pattern is regex
*/
public ResolvedTest( Type type, String pattern, boolean isRegex )
{
@@ -123,12 +127,14 @@ public final class ResolvedTest
}
/**
- * Test class file pattern, e.g. org/**/Cat*.class<br/>, or null if not any
+ * Test class file pattern, e.g. org/**/Cat*.class<br>, or null if not any
* and {@link #hasTestClassPattern()} returns false.
- * Other examples: org/animals/Cat*, org/animals/Ca?.class, %regex[Cat.class|Dog.*]<br/>
- * <br/>
+ * Other examples: org/animals/Cat*, org/animals/Ca?.class, %regex[Cat.class|Dog.*]<br>
+ * <br>
* '*' means zero or more characters<br>
* '?' means one and only one character
+ *
+ * @return class pattern or regex
*/
public String getTestClassPattern()
{
@@ -141,11 +147,13 @@ public final class ResolvedTest
}
/**
- * Test method, e.g. "realTestMethod".<br/>, or null if not any and {@link #hasTestMethodPattern()} returns false.
- * Other examples: test* or testSomethin? or %regex[testOne|testTwo] or %ant[testOne|testTwo]<br/>
- * <br/>
+ * Test method, e.g. "realTestMethod".<br>, or null if not any and {@link #hasTestMethodPattern()} returns false.
+ * Other examples: test* or testSomethin? or %regex[testOne|testTwo] or %ant[testOne|testTwo]<br>
+ * <br>
* '*' means zero or more characters<br>
* '?' means one and only one character
+ *
+ * @return method pattern or regex
*/
public String getTestMethodPattern()
{
@@ -266,6 +274,9 @@ public final class ResolvedTest
/**
* Prevents {@link #match(String, String)} from throwing NPE in situations when inclusive returns true.
+ *
+ * @param testClassFile path to class file
+ * @return {@code true} if examined class in null and class pattern exists
*/
private boolean alwaysInclusiveQuietly( String testClassFile )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
index a7f0e28..359ac94 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
@@ -38,9 +38,9 @@ import static org.apache.maven.surefire.testset.ResolvedTest.Type.METHOD;
// TODO In Surefire 3.0 see SUREFIRE-1309 and use normal fully qualified class name regex instead.
/**
* Resolved multi pattern filter e.g. -Dtest=MyTest#test,!AnotherTest#otherTest into an object model
- * composed of included and excluded tests.<br/>
+ * composed of included and excluded tests.<br>
* The methods {@link #shouldRun(String, String)} are filters easily used in JUnit filter or TestNG.
- * This class is independent of JUnit and TestNG API.<br/>
+ * This class is independent of JUnit and TestNG API.<br>
* It is accessed by Java Reflection API in {@link org.apache.maven.surefire.booter.SurefireReflector}
* using specific ClassLoader.
*/
@@ -139,7 +139,7 @@ public class TestListResolver
*
* @param resolver filter possibly having method patterns
* @return {@code resolver} if {@link TestListResolver#hasMethodPatterns() resolver.hasMethodPatterns()}
- * returns <tt>true</tt>; Otherwise wildcard filter <em>*.class</em> is returned.
+ * returns {@code true}; Otherwise wildcard filter {@code *.class} is returned.
*/
public static TestListResolver optionallyWildcardFilter( TestListResolver resolver )
{
@@ -456,7 +456,7 @@ public class TestListResolver
}
/**
- * Requires trimmed <code>request</code> been not equal to "!".
+ * Requires trimmed {@code request} been not equal to "!".
*/
static void resolveTestRequest( String request, IncludedExcludedPatterns patterns,
Collection<ResolvedTest> includedFilters, Collection<ResolvedTest> excludedFilters )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
index a1c9315..ef8d666 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
@@ -74,6 +74,8 @@ public class TestRequest
/**
* A specific test request issued with -Dtest= from the command line.
+ *
+ * @return filter
*/
public TestListResolver getTestListResolver()
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
index e0b03aa..f6966b0 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
@@ -30,11 +30,11 @@ public class TestSetFailedException
{
/**
- * Create a <code>TestFailedException</code> with a detail message.
+ * Creates {@code TestSetFailedException} with a detail message.
*
- * @param message A detail message for this <code>TestFailedException</code>, or
- * <code>null</code>. If <code>null</code> is passed, the <code>getMessage</code>
- * method will return an empty <code>String</code>.
+ * @param message A detail message for this {@code TestSetFailedException}, or
+ * {@code null}. If {@code null} is passed, the {@link #getMessage}
+ * method will return an empty {@link String string}.
*/
public TestSetFailedException( String message )
{
@@ -42,15 +42,15 @@ public class TestSetFailedException
}
/**
- * Create a <code>TestFailedException</code> with the specified detail
+ * Creates {@code TestSetFailedException} with the specified detail
* message and cause.
- * <p/>
+ * <br>
* <p>Note that the detail message associated with cause is
- * <em>not</em> automatically incorporated in this throwable's detail
+ * <b>NOT</b> automatically incorporated in this throwable's detail
* message.
*
- * @param message A detail message for this <code>TestFailedException</code>, or <code>null</code>.
- * @param cause the cause, which is saved for later retrieval by the <code>getCause</code> method.
+ * @param message A detail message for this {@code TestSetFailedException}, or {@code null}.
+ * @param cause the cause, which is saved for later retrieval by the {@link #getCause} method.
* (A null value is permitted, and indicates that the cause is nonexistent or unknown.)
*/
public TestSetFailedException( String message, Throwable cause )
@@ -59,9 +59,8 @@ public class TestSetFailedException
}
/**
- * Create a <code>TestFailedException</code> with the specified cause. The
- * <code>getMessage</code> method of this exception object will return
- * <code>(cause == null ? "" : cause.toString())</code>.
+ * Creates {@code TestSetFailedException} with the specified cause. The mthod {@link #getMessage} method of this
+ * exception object will return {@code cause == null ? "" : cause.toString()}.
*
* @param cause The cause
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
index ca5d2be..eb3b04a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
@@ -30,9 +30,8 @@ public class SurefireReflectionException
extends RuntimeException
{
/**
- * Create a <code>SurefireReflectionException</code> with the specified cause. The
- * <code>getMessage</code> method of this exception object will return
- * <code>(cause == null ? "" : cause.toString())</code>.
+ * Create a {@link SurefireReflectionException} with the specified cause. The method {@link #getMessage} of this
+ * exception object will return {@code cause == null ? "" : cause.toString()}.
*
* @param cause The cause of this exception
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
index 4912f8e..3610a4b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
@@ -57,6 +57,7 @@ public final class DaemonThreadFactory
/**
* Should be used by thread pools.
+ * @return new instance of {@link ThreadFactory} where each {@link Thread thread} is daemon
*/
public static ThreadFactory newDaemonThreadFactory()
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
index cad2e7a..302358c 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
@@ -48,6 +48,9 @@ public final class DumpFileUtils
/**
* New dump file. Synchronized object appears in main memory and perfectly visible in other threads.
+ *
+ * @param dumpFileName dump file name
+ * @param configuration only report directory
*/
public static synchronized File newDumpFile( String dumpFileName, ReporterConfiguration configuration )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
index bb7c3a7..8f16513 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
@@ -27,12 +27,14 @@ import java.util.StringTokenizer;
/**
* <p>
- * Common <code>String</code> manipulation routines.
+ * Common {@link String java.lang.String} manipulation routines.
* </p>
- * <p/>
+ * <br>
* <p>
* Originally from <a href="http://jakarta.apache.org/turbine/">Turbine</a> and the GenerationJavaCore library.
* </p>
+ * <br>
+ * NOTE: This class is not part of any api and is public purely for technical reasons !
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
@@ -46,12 +48,6 @@ import java.util.StringTokenizer;
* @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id: StringUtils.java 8001 2009-01-03 13:17:09Z vsiveton $
- * @noinspection JavaDoc
- * <p/>
- * A quick borrow from plexus-utils by Kristian Rosenvold, to restore jdk1.3 compat Threw away all the
- * unused stuff.
- * <p/>
- * NOTE: This class is not part of any api and is public purely for technical reasons !
* @since 1.0
*/
public final class StringUtils
@@ -81,8 +77,7 @@ public final class StringUtils
public static String[] split( String text, String separator )
{
- int max = -1;
- StringTokenizer tok;
+ final StringTokenizer tok;
if ( separator == null )
{
// Null separator means we're using StringTokenizer's default
@@ -94,46 +89,21 @@ public final class StringUtils
tok = new StringTokenizer( text, separator );
}
- int listSize = tok.countTokens();
- if ( max > 0 && listSize > max )
+ String[] list = new String[tok.countTokens()];
+ for ( int i = 0; tok.hasMoreTokens(); i++ )
{
- listSize = max;
- }
-
- String[] list = new String[listSize];
- int i = 0;
- int lastTokenBegin;
- int lastTokenEnd = 0;
- while ( tok.hasMoreTokens() )
- {
- if ( max > 0 && i == listSize - 1 )
- {
- // In the situation where we hit the max yet have
- // tokens left over in our input, the last list
- // element gets all remaining text.
- String endToken = tok.nextToken();
- lastTokenBegin = text.indexOf( endToken, lastTokenEnd );
- list[i] = text.substring( lastTokenBegin );
- break;
- }
- else
- {
- list[i] = tok.nextToken();
- lastTokenBegin = text.indexOf( list[i], lastTokenEnd );
- lastTokenEnd = lastTokenBegin + list[i].length();
- }
- i++;
+ list[i] = tok.nextToken();
}
return list;
}
/**
* <p>
- * Checks if a (trimmed) String is <code>null</code> or blank.
+ * Checks if a (trimmed) String is {@code null} or blank.
* </p>
*
* @param str the String to check
- * @return <code>true</code> if the String is <code>null</code>, or length zero once trimmed
+ * @return {@code true} if the String is {@code null}, or length zero once trimmed
*/
public static boolean isBlank( String str )
{
@@ -142,12 +112,11 @@ public final class StringUtils
/**
* <p>
- * Checks if a (trimmed) String is not <code>null</code> and not blank.
+ * Checks if a (trimmed) String is not {@code null} and not blank.
* </p>
*
* @param str the String to check
- * @return <code>true</code> if the String is not <code>null</code> and length of trimmed
- * <code>str</code> is not zero.
+ * @return {@code true} if the String is not {@code null} and length of trimmed {@code str} is not zero.
*/
public static boolean isNotBlank( String str )
{
@@ -255,7 +224,7 @@ public final class StringUtils
* <p>
* A save length of {@code out} is {@code len * 3 + outoff}.
* <p>
- * The reverse-method is {@link #unescapeBytes(byte[], String)}.
+ * The reverse-method is {@link #unescapeBytes(String, String)}.
*
* @param out output buffer
* @param outoff offset in the output buffer
@@ -339,9 +308,7 @@ public final class StringUtils
try
{
decodedFromSourceCharset = sourceCharset.newDecoder().decode( ByteBuffer.wrap( out, 0, outPos ) );
- ByteBuffer defaultEncoded = DEFAULT_CHARSET.encode( decodedFromSourceCharset );
-
- return defaultEncoded;
+ return DEFAULT_CHARSET.encode( decodedFromSourceCharset );
}
catch ( CharacterCodingException e )
{
@@ -358,10 +325,11 @@ public final class StringUtils
}
/**
+ * Determines if {@code buffer} starts with specific literal(s).
*
* @param buffer Examined StringBuffer
- * @param pattern a pattern which should start in <code>buffer</code>
- * @return <tt>true</tt> if buffer's literal starts with given pattern
+ * @param pattern a pattern which should start in {@code buffer}
+ * @return {@code true} if buffer's literal starts with given {@code pattern}, or both are empty.
*/
public static boolean startsWith( StringBuffer buffer, String pattern )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
index 9118448..b99d4f9 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
/**
* Inclusive test patters:<p>
*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
index bb64115..8fa760b 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
@@ -37,12 +37,12 @@ import static org.apache.maven.surefire.cli.CommandLineOption.*;
/**
* Knows how to serialize and deserialize the booter configuration.
- * <p/>
+ * <br>
* The internal serialization format is through a properties file. The long-term goal of this
* class is not to expose this implementation information to its clients. This still leaks somewhat,
* and there are some cases where properties are being accessed as "Properties" instead of
* more representative domain objects.
- * <p/>
+ * <br>
*
* @author Jason van Zyl
* @author Emmanuel Venisse
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
index 84ed9eb..531e7a1 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
@@ -116,6 +116,9 @@ public class Classpath implements Iterable<String>
/**
* @deprecated this should be package private method which returns List of Files. It will be
* removed in the next major version.
+ *
+ * @return list of {@link URL jar files paths} with {@code file} protocol in URL.
+ * @throws MalformedURLException if {@link URL} could not be created upon given class-path element(s)
*/
@Deprecated
public List<URL> getAsUrlList()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
index 7425e3d..0e84315 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.booter;
/**
* Represents the classpaths for the BooterConfiguration.
- * <p/>
+ * <br>
*
* @author Jason van Zyl
* @author Emmanuel Venisse
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index d5bba1f..8dabaef 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -63,9 +63,9 @@ import static org.apache.maven.surefire.util.internal.StringUtils.encodeStringFo
/**
* The part of the booter that is unique to a forked vm.
- * <p/>
+ * <br>
* Deals with deserialization of the booter wire-level protocol
- * <p/>
+ * <br>
*
* @author Jason van Zyl
* @author Emmanuel Venisse
@@ -82,7 +82,7 @@ public final class ForkedBooter
/**
* This method is invoked when Surefire is forked - this method parses and organizes the arguments passed to it and
- * then calls the Surefire class' run method. <p/> The system exit code will be 1 if an exception is thrown.
+ * then calls the Surefire class' run method. <br> The system exit code will be 1 if an exception is thrown.
*
* @param args Commandline arguments
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
index a4d7d09..601acd5 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.Set;
/**
- * @noinspection CustomClassloader
+ * Loads classes from jar files added via {@link #addURL(URL)}.
*/
public class IsolatedClassLoader
extends URLClassLoader
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
index 79cbd42..c7379e4 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
@@ -33,7 +33,7 @@ import org.apache.maven.surefire.testset.TestRequest;
/**
* Represents the surefire configuration that passes all the way into the provider
* classloader and the provider.
- * <p/>
+ * <br>
*
* @author Jason van Zyl
* @author Emmanuel Venisse
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
index ae4e08e..e800cfe 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
@@ -34,7 +34,7 @@ import static org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArr
/**
* Creates the surefire provider.
- * <p/>
+ * <br>
*
* @author Kristian Rosenvold
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
index ce23d3e..91530b7 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
@@ -95,8 +95,8 @@ public class StartupConfiguration
/**
* <p>Strip any of a supplied String from the end of a String.</p>
- * <p/>
- * <p>If the strip String is <code>null</code>, whitespace is
+ * <br>
+ * <p>If the strip String is {@code null}, whitespace is
* stripped.</p>
*
* @param str the String to remove characters from
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
index 2dfd1cc..9a49d1a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
@@ -32,7 +32,7 @@ import java.util.Map;
import static org.junit.runners.Parameterized.Parameter;
/**
- * Base test class for SUREFIRE-580, configuration parameter <em>skipAfterFailureCount</em>.
+ * Base test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
index 86df7fa..beb1e32 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import static org.junit.runners.Parameterized.Parameters;
/**
- * Test class for SUREFIRE-580, configuration parameter <em>skipAfterFailureCount</em>.
+ * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
index 40ebc9f..f4aa2b7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import static org.junit.runners.Parameterized.Parameters;
/**
- * Test class for SUREFIRE-580, configuration parameter <em>skipAfterFailureCount</em>.
+ * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
index 58d270a..a6c539c 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Test include/exclude from files.
- * <p/>
+ * <br>
* Based on {@link IncludesExcludesIT}.
*/
public class IncludesExcludesFromFileIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
index d6856b3..bf393ca 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
/**
- * Testing <code>@net.jcip.annotations.NotThreadSafe</code> with ParallelComputerBuilder.
+ * Testing {@code @net.jcip.annotations.NotThreadSafe} with ParallelComputerBuilder.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
index a99c142..5470a3f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
@@ -31,7 +31,7 @@ import org.junit.Test;
/**
* Verifies unicode filenames pass through correctly.
- * <p/>
+ * <br>
* If the underlying file system turns out not to support unicode, we just fail an assumption.s
*/
public class UnicodeTestNamesIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index e7aff2e..bd12dda 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -38,7 +38,7 @@ import static java.util.Collections.unmodifiableList;
/**
* Encapsulate all needed features to start a maven run
- * <p/>
+ * <br>
*
* @author Kristian Rosenvold
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
index c300abf..ee04dbc 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.its.fixture;
/**
* Contains commonly used features for most tests, encapsulating
* common use cases.
- * <p/>
+ * <br>
* Also includes thread-safe access to the extracted resource
* files, which AbstractSurefireIntegrationTestClass does not.
* Thread safe only for running in "classes" mode.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 4cb162d..e2356f4 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -29,7 +29,7 @@ import static java.util.Collections.singletonList;
/**
* Encapsulate all needed features to start a surefire run
- * <p/>
+ * <br>
* Also includes thread-safe access to the extracted resource
* files
*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
index 9866dd5..886cd07 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
@@ -29,7 +29,7 @@ import org.junit.Test;
* Found in Surefire 2.16.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1024}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1024">SUREFIRE-1024</a>
* @since 2.19
*/
public class Surefire1024VerifyFailsafeIfTestedIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
index 6e4d76c..ec63a8a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
@@ -25,20 +25,20 @@ import org.junit.Test;
/**
* Plugin Configuration: parallel=classes
- * <p/>
+ * <br>
* With Surefire 2.15
* {@code $ mvn test -Dtest=MyTest#testFoo}
* Results:
* Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
- * <p/>
+ * <br>
* With Surefire 2.16
* {@code $ mvn test -Dtest=MyTest#testFoo}
- * <p/>
+ * <br>
* Results:
* Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1028}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1028">SUREFIRE-1028</a>
* @since 2.18
*/
public class Surefire1028UnableToRunSingleIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
index 1d5d353..0d6d8b6 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1036}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1036">SUREFIRE-1036</a>
* @since 2.18
*/
public class Surefire1036NonFilterableJUnitRunnerWithCategoriesIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
index 6494b79..b3ed744 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertFalse;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1053}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1053">SUREFIRE-1053</a>
* @since 2.18
*/
public class Surefire1053SystemPropertiesIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
index 27d8cfd..d6a38fa 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
@@ -24,8 +24,8 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
/**
- * Description of SUREFIRE-1080: <p/>
- * <p/>
+ * Description of SUREFIRE-1080: <br>
+ * <br>
* There are 9 tests in total in the attached project, and mvn test will show 9 tests run.
* When I use the command " mvn test -Dparallel=classes -DforkCount=2 -DuseUnlimitedThreads=true", it shows 13 tests
* run (and sometimes 16), and some tests are run more than once.
@@ -35,7 +35,7 @@ import org.junit.Test;
* JUnit 4.11
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1080}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1080">SUREFIRE-1080</a>
* @since 2.18
*/
public class Surefire1080ParallelForkDoubleTestIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
index a39f870..b1d9d4f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertThat;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1082}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1082">SUREFIRE-1082</a>
* @since 2.18
*/
public class Surefire1082ParallelJUnitParameterizedIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
index 509f3d0..f894265 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
@@ -23,6 +23,7 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
/**
*
* In the surefire plugin, it is possible to specify one or more RunListener when running tests with JUnit.
@@ -41,7 +42,7 @@ import org.junit.Test;
* Note: other methods in the RunListener I tested seems fine (i.e., they get a valid Description object as input)
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1095}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1095}"/>
* @since 2.18
*/
public final class Surefire1095NpeInRunListener
@@ -50,7 +51,7 @@ public final class Surefire1095NpeInRunListener
/**
* Method Request.classes( String, Class[] ); exists in JUnit 4.0 - 4.4
- * @see JUnit4Reflector
+ * See JUnit4Reflector.
*/
@Test
public void testRunStartedWithJUnit40()
@@ -64,7 +65,7 @@ public final class Surefire1095NpeInRunListener
/**
* Method Request.classes( Class[] ); Since of JUnit 4.5
- * @see JUnit4Reflector
+ * See JUnit4Reflector.
*/
@Test
public void testRunStartedWithJUnit45()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
index fc559ec..e81f066 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
@@ -35,17 +35,17 @@ import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.AnyOf.anyOf;
/**
- * The purpose of this IT is to assert that the run order of test classes is according to the settings:<p/>
+ * The purpose of this IT is to assert that the run order of test classes is according to the settings:<br>
*
- * runOrder=balanced<p/>
- * parallel=classes<p/>
- * threadCount=2<p/>
- * perCoreThreadCount=false<p/>
- * <p/>
+ * runOrder=balanced<br>
+ * parallel=classes<br>
+ * threadCount=2<br>
+ * perCoreThreadCount=false<br>
+ * <br>
* The list of tests should be reordered to (DTest, CTest, BTest, ATest) in the second run.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1098}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1098">SUREFIRE-1098</a>
* @since 2.18
*/
public class Surefire1098BalancedRunOrderIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
index 03e7639..2f9dca8 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* @author agudian
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1122}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1122">SUREFIRE-1122</a>
*/
public class Surefire1122ParallelAndFlakyTestsIT
extends SurefireJUnit4IntegrationTestCase
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
index 84735a9..f78c16a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
/**
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1146}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1146">SUREFIRE-1146</a>
*/
public class Surefire1146RerunFailedAndParameterized
extends SurefireJUnit4IntegrationTestCase
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
index 17064c0..706f6b5 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
/**
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1158}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1158">SUREFIRE-1158</a>
* @since 2.19
*/
@RunWith( Parameterized.class )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
index 7d60138..f886446 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
@@ -28,7 +28,7 @@ import org.junit.Test;
* Allow rerunFailingTestsCount, skipAfterFailureCount together
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1202}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1202">SUREFIRE-1202</a>
* @since 2.19.1
*/
public class Surefire1202RerunAndSkipIT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/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:tibordigana@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:tibordigana@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/b54e33e6/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:tibordigana@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:tibordigana@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/b54e33e6/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:tibordigana@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:tibordigana@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/b54e33e6/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:tibordigana@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/b54e33e6/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:tibordigana@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/b54e33e6/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:tibordigana@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/b54e33e6/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:tibordigana@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/b54e33e6/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:tibordigana@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/b54e33e6/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml b/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
index 623c226..2d066eb 100644
--- a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
+++ b/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
index 4020be5..01ce10c 100644
--- a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
index b28ab64..9897a25 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
index 35dee50..b67c49a 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
index 631ca7c..42f0f32 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>