Author: carlos
Date: Wed Apr 19 13:05:40 2006
New Revision: 395380
URL: http://svn.apache.org/viewcvs?rev=395380&view=rev
Log:
[MSUREFIRE-86] Make surefire compile under Java 1.3, merged in r395142,
r395143, r395144, r395152, r395348, r395349, r395357, r395372 from trunk
Added:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java
- copied, changed from r391866,
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedCheckedException.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
- copied, changed from r391866,
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedRuntimeException.java
Removed:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedCheckedException.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedRuntimeException.java
Modified:
maven/surefire/branches/surefire-testng/pom.xml
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssertionFailedException.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterException.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
maven/surefire/branches/surefire-testng/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireExecutionException.java
maven/surefire/branches/surefire-testng/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireBooterTest.java
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/branches/surefire-testng/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/pom.xml?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/pom.xml (original)
+++ maven/surefire/branches/surefire-testng/pom.xml Wed Apr 19 13:05:40 2006
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>maven-parent</artifactId>
@@ -54,13 +55,6 @@
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/surefire/tags</tagBase>
@@ -74,4 +68,93 @@
<module>surefire-booter</module>
<module>surefire-providers</module>
</modules>
+
+ <profiles>
+ <!-- use preinstalled JDK 1.3 to build and test -->
+ <profile>
+ <id>jdk1.3</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <compilerVersion>1.3</compilerVersion>
+ <executable>${JAVA_1_3_HOME}/bin/javac</executable>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <jvm>${JAVA_1_3_HOME}/bin/java</jvm>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- ignore JDK 1.3 requirement for handy testing -->
+ <profile>
+ <id>ignoreJdk</id>
+ </profile>
+
+ <!-- print a warning when not using the JDK 1.3 profile, and prevent
deployment
+ NOTE prevent deployment actually don't work as the deploy plugin is
called
+ before the antrun in the deploy phase.
+ In multimodule the first module will be deployed and build will fail
after
+ -->
+ <profile>
+ <id>nojdk1.3</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>java1.3-validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <echo/>
+ <echo>=== WARNING: You are not building with Java 1.3 as
required ===</echo>
+ <echo>Set JAVA_1_3_HOME pointing to the JDK 1.3
installation folder</echo>
+ <echo>and run Maven with -Pjdk1.3 to activate the Java 1.3
profile</echo>
+ <echo>Building anyway.</echo>
+ <echo/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>java1.3-deploy</id>
+ <phase>deploy</phase>
+ <configuration>
+ <tasks>
+ <echo/>
+ <echo>=== ERROR: You are not building with Java 1.3 as
required ===</echo>
+ <echo>Set JAVA_1_3_HOME pointing to the JDK 1.3
installation folder</echo>
+ <echo>and run Maven with -Pjdk1.3 to activate the Java 1.3
profile</echo>
+ <echo/>
+ <echo>You could also run Maven with -PignoreJdk to use any
JDK version (be aware of the implications)</echo>
+ <echo/>
+ <fail>ERROR: You can not deploy without using Java
1.3.</fail>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssertionFailedException.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssertionFailedException.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssertionFailedException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssertionFailedException.java
Wed Apr 19 13:05:40 2006
@@ -1,6 +1,6 @@
package org.apache.maven.surefire.assertion;
-import org.apache.maven.surefire.testset.NestedRuntimeException;
+import org.apache.maven.surefire.util.NestedRuntimeException;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Modified:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterException.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterException.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterException.java
Wed Apr 19 13:05:40 2006
@@ -1,6 +1,6 @@
package org.apache.maven.surefire.report;
-import org.apache.maven.surefire.testset.NestedCheckedException;
+import org.apache.maven.surefire.util.NestedCheckedException;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Modified:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
Wed Apr 19 13:05:40 2006
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import org.apache.maven.surefire.util.NestedCheckedException;
+
/**
* Exception that indicates a test failed.
*
Copied:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java
(from r391866,
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedCheckedException.java)
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java?p2=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java&p1=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedCheckedException.java&r1=391866&r2=395380&rev=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedCheckedException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java
Wed Apr 19 13:05:40 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.testset;
+package org.apache.maven.surefire.util;
/*
* Copyright 2002-2005 the original author or authors.
@@ -71,7 +71,6 @@
/** Root cause of this nested exception */
private Throwable cause;
-
/**
* Construct a <code>NestedCheckedException</code> with no message or
exception
Copied:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
(from r391866,
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedRuntimeException.java)
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java?p2=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java&p1=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedRuntimeException.java&r1=391866&r2=395380&rev=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/testset/NestedRuntimeException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
Wed Apr 19 13:05:40 2006
@@ -1,7 +1,7 @@
-package org.apache.maven.surefire.testset;
+package org.apache.maven.surefire.util;
/*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2006 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
*/
/*
- * Some parts are
+ * Some portions are
*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -67,7 +67,7 @@
* @see #printStackTrace
* @see NestedCheckedException
*/
-public abstract class NestedRuntimeException extends RuntimeException {
+public class NestedRuntimeException extends RuntimeException {
/** Root cause of this nested exception */
private Throwable cause;
@@ -88,27 +88,30 @@
}
/**
- * Construct a <code>NestedRuntimeException</code> with the specified
nested exception and no message.
+ * Construct a <code>NestedRuntimeException</code> with the specified
detail message
+ * and nested exception.
+ * @param msg the detail message
* @param ex the nested exception
*/
- public NestedRuntimeException(Throwable ex) {
- this();
+ public NestedRuntimeException(String msg, Throwable ex) {
+ super(msg);
this.cause = ex;
}
/**
- * Construct a <code>NestedRuntimeException</code> with the specified
detail message
- * and nested exception.
- * @param msg the detail message
+ * Construct a <code>NestedRuntimeException</code> with the specified
nested exception.
* @param ex the nested exception
*/
- public NestedRuntimeException(String msg, Throwable ex) {
- this(msg);
+ public NestedRuntimeException(Throwable ex) {
+ super();
this.cause = ex;
}
/**
* Return the nested cause, or <code>null</code> if none.
+ * <p>Note that this will only check one level of nesting.
+ * Use <code>getRootCause()</code> to retrieve the innermost cause.
+ * @see #getRootCause()
*/
public Throwable getCause() {
// Even if you cannot set the cause of this exception other than
through
@@ -161,6 +164,22 @@
}
/**
+ * Retrieve the innermost cause of this exception, if any.
+ * <p>Currently just traverses NestedRuntimeException causes. Will use
+ * the JDK 1.4 exception cause mechanism once Spring requires JDK 1.4.
+ * @return the innermost exception, or <code>null</code> if none
+ */
+ public Throwable getRootCause() {
+ Throwable cause = getCause();
+ if (cause instanceof NestedRuntimeException) {
+ return ((NestedRuntimeException) cause).getRootCause();
+ }
+ else {
+ return cause;
+ }
+ }
+
+ /**
* Check whether this exception contains an exception of the given class:
* either it is of the given class itself or it contains a nested cause
* of the given class.
@@ -172,21 +191,16 @@
if (exClass == null) {
return false;
}
- Throwable ex = this;
- while (ex != null) {
- if (exClass.isInstance(ex)) {
- return true;
- }
- if (ex instanceof NestedRuntimeException) {
- // Cast is necessary on JDK 1.3, where Throwable does not
- // provide a "getCause" method itself.
- ex = ((NestedRuntimeException) ex).getCause();
- }
- else {
- ex = null;
- }
+ if (exClass.isInstance(this)) {
+ return true;
+ }
+ Throwable cause = getCause();
+ if (cause instanceof NestedRuntimeException) {
+ return ((NestedRuntimeException) cause).contains(exClass);
+ }
+ else {
+ return (cause != null && exClass.isInstance(cause));
}
- return false;
}
-}
+}
\ No newline at end of file
Modified:
maven/surefire/branches/surefire-testng/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-api/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
Wed Apr 19 13:05:40 2006
@@ -58,6 +58,22 @@
assertResult( reporter, message );
}
+ public void testReplaceAll()
+ {
+ String s, from, to;
+ s = "";
+ from = "";
+ to = "";
+ String result = XMLReporter.replaceAll( s, from, to );
+ assertEquals( "", result );
+
+ s = "xxfromyytozz";
+ from = "from";
+ to = "to";
+ result = XMLReporter.replaceAll( s, from, to );
+ assertEquals( "xxtoyytozz", result );
+ }
+
private void assertResult( XMLReporter reporter, String message )
{
Xpp3Dom result = reporter.getTestCase();
Modified:
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
Wed Apr 19 13:05:40 2006
@@ -704,11 +704,16 @@
*
* @since 1.5.4
* @param s the string to be splitted
- * @param delim the delimiter to be used
+ * @param delimiter the delimiter to be used
* @return an array with the Strings between the delimiters
*/
- public static String[] split( String s, String delim )
+ public static String[] split( String s, String delimiter )
{
+ String delim = delimiter;
+ if ( "\\|".equals( delimiter ) )
+ {
+ delim = "|";
+ }
if ( s.equals(delim) )
{
return new String[0];
Modified:
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
Wed Apr 19 13:05:40 2006
@@ -1,6 +1,6 @@
package org.apache.maven.surefire.booter;
-import org.apache.maven.surefire.testset.NestedCheckedException;
+import org.apache.maven.surefire.util.NestedCheckedException;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Modified:
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireExecutionException.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireExecutionException.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireExecutionException.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireExecutionException.java
Wed Apr 19 13:05:40 2006
@@ -1,6 +1,6 @@
package org.apache.maven.surefire.booter;
-import org.apache.maven.surefire.testset.NestedCheckedException;
+import org.apache.maven.surefire.util.NestedCheckedException;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Modified:
maven/surefire/branches/surefire-testng/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireBooterTest.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireBooterTest.java?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireBooterTest.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireBooterTest.java
Wed Apr 19 13:05:40 2006
@@ -1,11 +1,5 @@
package org.apache.maven.surefire.booter;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.maven.surefire.SurefireBooter;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -22,6 +16,12 @@
* limitations under the License.
*/
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
+
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Carlos Sanchez</a>
* @version $Id$
@@ -37,58 +37,58 @@
s = "x1:y2:z;j:f";
List list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "x1", "y2", "z;j", "f" }
), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "x1";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "x1" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "x1:";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "x1" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = ":";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Collections.EMPTY_LIST, list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
d = "::";
s = "x1::y2::z;j::f";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "x1", "y2", "z;j", "f" }
), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "x1";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "x1" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "x1::";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "x1" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { "" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = ":";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Arrays.asList( new String[] { ":" } ), list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
s = "::";
list = Arrays.asList( SurefireBooter.split( s, d ) );
assertEquals( Collections.EMPTY_LIST, list );
- assertEquals( Arrays.asList( s.split( d ) ), list );
+ //assertEquals( Arrays.asList( s.split( d ) ), list );
}
}
Modified:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml?rev=395380&r1=395379&r2=395380&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
(original)
+++
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
Wed Apr 19 13:05:40 2006
@@ -53,5 +53,9 @@
</dependency>
</dependencies>
</profile>
+ <!-- ignore the jdk 1.3 requirement -->
+ <profile>
+ <id>nojdk1.3</id>
+ </profile>
</profiles>
</project>
