You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by st...@apache.org on 2010/08/17 07:24:38 UTC
svn commit: r986189 - in /maven/surefire/trunk/surefire-api/src:
main/java/org/apache/maven/surefire/util/
test/java/org/apache/maven/surefire/util/
test/java/org/apache/maven/surefire/util/testdata/java/
test/java/org/apache/maven/surefire/util/testda...
Author: stephenc
Date: Tue Aug 17 05:24:38 2010
New Revision: 986189
URL: http://svn.apache.org/viewvc?rev=986189&view=rev
Log:
[SUREFIRE-638] Submitted by Stevo Slavic
o Applied unmodified
Added:
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java (with props)
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireDirectoryScanner.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/SurefireDirectoryScannerTest.java
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireDirectoryScanner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireDirectoryScanner.java?rev=986189&r1=986188&r2=986189&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireDirectoryScanner.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireDirectoryScanner.java Tue Aug 17 05:24:38 2010
@@ -18,7 +18,6 @@ package org.apache.maven.surefire.util;
* under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.testset.SurefireTestSet;
@@ -35,6 +34,8 @@ public class SurefireDirectoryScanner {
private static final String FS = System.getProperty( "file.separator" );
private static final String[] EMPTY_STRING_ARRAY = new String[0];
+ private static final String JAVA_SOURCE_FILE_EXTENSION = ".java";
+ private static final String JAVA_CLASS_FILE_EXTENSION = ".class";
private final File basedir;
@@ -162,7 +163,16 @@ public class SurefireDirectoryScanner {
for ( int i = 0; i < incs.length; i++ )
{
- incs[i] = StringUtils.replace( (String) list.get( i ), "java", "class" );
+ String inc = (String) list.get( i );
+ if ( inc.endsWith( JAVA_SOURCE_FILE_EXTENSION )) {
+ inc = new StringBuffer( inc.length()
+ - JAVA_SOURCE_FILE_EXTENSION.length()
+ + JAVA_CLASS_FILE_EXTENSION.length() )
+ .append( inc.substring(0, inc.lastIndexOf( JAVA_SOURCE_FILE_EXTENSION )))
+ .append( JAVA_CLASS_FILE_EXTENSION )
+ .toString();
+ }
+ incs[i] = inc;
}
return incs;
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/SurefireDirectoryScannerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/SurefireDirectoryScannerTest.java?rev=986189&r1=986188&r2=986189&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/SurefireDirectoryScannerTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/SurefireDirectoryScannerTest.java Tue Aug 17 05:24:38 2010
@@ -41,6 +41,6 @@ public class SurefireDirectoryScannerTes
SurefireDirectoryScanner surefireDirectoryScanner = new SurefireDirectoryScanner(baseDir, include, exclude);
String[] classNames = surefireDirectoryScanner.collectTests();
assertNotNull( classNames);
- assertEquals(3, classNames.length);
+ assertEquals(4, classNames.length);
}
}
Added: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java?rev=986189&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java (added)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java Tue Aug 17 05:24:38 2010
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.surefire.util.testdata.java.javascript;
+
+/**
+ * Test data class for SUREFIRE-638
+ * User: sslavic
+ * Date: August 16, 2010
+ * Time: 11:13:18 PM
+ */
+public class DataJavaZT4A {
+}
Propchange: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java
------------------------------------------------------------------------------
svn:mime-type = text/plain