You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/12/06 22:45:10 UTC
svn commit: r1718227 - in /maven/shared/trunk/maven-shared-io: ./
src/test/java/org/apache/maven/shared/io/
src/test/java/org/apache/maven/shared/io/download/
src/test/java/org/apache/maven/shared/io/location/
Author: khmarbaise
Date: Sun Dec 6 21:45:09 2015
New Revision: 1718227
URL: http://svn.apache.org/viewvc?rev=1718227&view=rev
Log:
Renamed TestUtils.java to Utils.java and removed
excludes for maven-surefire-plugin.
Added:
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/Utils.java
- copied, changed from r1718223, maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
Removed:
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
Modified:
maven/shared/trunk/maven-shared-io/pom.xml
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocationTest.java
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/FileLocationTest.java
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocationTest.java
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocatorStrategyTest.java
Modified: maven/shared/trunk/maven-shared-io/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=1718227&r1=1718226&r2=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/pom.xml (original)
+++ maven/shared/trunk/maven-shared-io/pom.xml Sun Dec 6 21:45:09 2015
@@ -115,16 +115,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestUtils*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Copied: maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/Utils.java (from r1718223, maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/Utils.java?p2=maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/Utils.java&p1=maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java&r1=1718223&r2=1718227&rev=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java (original)
+++ maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/Utils.java Sun Dec 6 21:45:09 2015
@@ -32,10 +32,10 @@ import org.apache.maven.shared.utils.io.
import org.apache.maven.shared.utils.ReaderFactory;
import org.apache.maven.shared.utils.WriterFactory;
-public final class TestUtils
+public final class Utils
{
- private TestUtils()
+ private Utils()
{
}
Modified: maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java?rev=1718227&r1=1718226&r2=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java (original)
+++ maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java Sun Dec 6 21:45:09 2015
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.Collections;
import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.shared.io.TestUtils;
+import org.apache.maven.shared.io.Utils;
import org.apache.maven.shared.io.logging.DefaultMessageHolder;
import org.apache.maven.shared.io.logging.MessageHolder;
import org.apache.maven.wagon.ConnectionException;
@@ -185,7 +185,7 @@ public class DefaultDownloadManagerTest
}
catch ( DownloadFailedException e )
{
- assertTrue( TestUtils.toString( e ).indexOf( "UnsupportedProtocolException" ) > -1 );
+ assertTrue( Utils.toString( e ).indexOf( "UnsupportedProtocolException" ) > -1 );
}
verify( wagon, wagonManager );
@@ -211,7 +211,7 @@ public class DefaultDownloadManagerTest
}
catch ( DownloadFailedException e )
{
- assertTrue( TestUtils.toString( e ).indexOf( "ConnectionException" ) > -1 );
+ assertTrue( Utils.toString( e ).indexOf( "ConnectionException" ) > -1 );
}
verify( wagon, wagonManager );
@@ -237,7 +237,7 @@ public class DefaultDownloadManagerTest
}
catch ( DownloadFailedException e )
{
- assertTrue( TestUtils.toString( e ).indexOf( "AuthenticationException" ) > -1 );
+ assertTrue( Utils.toString( e ).indexOf( "AuthenticationException" ) > -1 );
}
verify( wagon, wagonManager );
@@ -263,7 +263,7 @@ public class DefaultDownloadManagerTest
}
catch ( DownloadFailedException e )
{
- assertTrue( TestUtils.toString( e ).indexOf( "TransferFailedException" ) > -1 );
+ assertTrue( Utils.toString( e ).indexOf( "TransferFailedException" ) > -1 );
}
verify( wagon, wagonManager );
@@ -289,7 +289,7 @@ public class DefaultDownloadManagerTest
}
catch ( DownloadFailedException e )
{
- assertTrue( TestUtils.toString( e ).indexOf( "ResourceDoesNotExistException" ) > -1 );
+ assertTrue( Utils.toString( e ).indexOf( "ResourceDoesNotExistException" ) > -1 );
}
verify( wagon, wagonManager );
@@ -315,7 +315,7 @@ public class DefaultDownloadManagerTest
}
catch ( DownloadFailedException e )
{
- assertTrue( TestUtils.toString( e ).indexOf( "AuthorizationException" ) > -1 );
+ assertTrue( Utils.toString( e ).indexOf( "AuthorizationException" ) > -1 );
}
verify( wagon, wagonManager );
Modified: maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocationTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocationTest.java?rev=1718227&r1=1718226&r2=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocationTest.java (original)
+++ maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocationTest.java Sun Dec 6 21:45:09 2015
@@ -28,7 +28,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.shared.io.TestUtils;
+import org.apache.maven.shared.io.Utils;
public class ArtifactLocationTest
extends TestCase
@@ -58,7 +58,7 @@ public class ArtifactLocationTest
String testStr = "This is a test";
- TestUtils.writeFileWithEncoding( f, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( f, testStr, "US-ASCII" );
Artifact a = new DefaultArtifact( "group", "artifact", VersionRange.createFromVersion( "1" ), null, "jar",
null, new DefaultArtifactHandler() );
Modified: maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/FileLocationTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/FileLocationTest.java?rev=1718227&r1=1718226&r2=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/FileLocationTest.java (original)
+++ maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/FileLocationTest.java Sun Dec 6 21:45:09 2015
@@ -19,7 +19,7 @@ package org.apache.maven.shared.io.locat
* under the License.
*/
-import org.apache.maven.shared.io.TestUtils;
+import org.apache.maven.shared.io.Utils;
import org.apache.maven.shared.utils.io.IOUtil;
import java.io.ByteArrayOutputStream;
@@ -52,7 +52,7 @@ public class FileLocationTest
String testStr = "This is a test";
- TestUtils.writeFileWithEncoding( file, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( file, testStr, "US-ASCII" );
FileLocation location = new FileLocation( file, file.getAbsolutePath() );
@@ -71,7 +71,7 @@ public class FileLocationTest
String testStr = "This is a test";
- TestUtils.writeFileWithEncoding( file, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( file, testStr, "US-ASCII" );
FileLocation location = new FileLocation( file, file.getAbsolutePath() );
@@ -91,7 +91,7 @@ public class FileLocationTest
String testStr = "This is a test";
- TestUtils.writeFileWithEncoding( file, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( file, testStr, "US-ASCII" );
FileLocation location = new FileLocation( file, file.getAbsolutePath() );
@@ -110,7 +110,7 @@ public class FileLocationTest
String testStr = "This is a test";
- TestUtils.writeFileWithEncoding( file, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( file, testStr, "US-ASCII" );
FileLocation location = new FileLocation( file, file.getAbsolutePath() );
Modified: maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocationTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocationTest.java?rev=1718227&r1=1718226&r2=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocationTest.java (original)
+++ maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocationTest.java Sun Dec 6 21:45:09 2015
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
-import org.apache.maven.shared.io.TestUtils;
+import org.apache.maven.shared.io.Utils;
import junit.framework.TestCase;
@@ -61,7 +61,7 @@ public class URLLocationTest
String testStr = "This is a test";
- TestUtils.writeFileWithEncoding( f, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( f, testStr, "US-ASCII" );
URL url = f.toURL();
Modified: maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocatorStrategyTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocatorStrategyTest.java?rev=1718227&r1=1718226&r2=1718227&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocatorStrategyTest.java (original)
+++ maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/location/URLLocatorStrategyTest.java Sun Dec 6 21:45:09 2015
@@ -24,7 +24,7 @@ import java.io.IOException;
import junit.framework.TestCase;
-import org.apache.maven.shared.io.TestUtils;
+import org.apache.maven.shared.io.Utils;
import org.apache.maven.shared.io.logging.DefaultMessageHolder;
import org.apache.maven.shared.io.logging.MessageHolder;
@@ -59,7 +59,7 @@ public class URLLocatorStrategyTest
String testStr = "This is a test.";
- TestUtils.writeFileWithEncoding( tempFile, testStr, "US-ASCII" );
+ Utils.writeFileWithEncoding( tempFile, testStr, "US-ASCII" );
MessageHolder mh = new DefaultMessageHolder();