git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133396 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M1
@@ -267,7 +267,7 @@ public class ChecksummedFile | |||
String rawChecksum = FileUtils.readFileToString( checksumFile ); | |||
String expectedChecksum = parseChecksum( rawChecksum, checksumAlgorithm, referenceFile.getName() ); | |||
if ( StringUtils.equalsIgnoreCase( expectedChecksum, actualChecksum ) == false ) | |||
if ( ! StringUtils.equalsIgnoreCase( expectedChecksum, actualChecksum ) ) | |||
{ | |||
// create checksum (again) | |||
FileUtils.writeStringToFile( checksumFile, actualChecksum + " " + referenceFile.getName() ); |
@@ -111,4 +111,17 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<systemPropertyVariables> | |||
<java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir> | |||
</systemPropertyVariables> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</project> |
@@ -20,6 +20,7 @@ package org.apache.maven.archiva.proxy; | |||
*/ | |||
import junit.framework.TestCase; | |||
import net.sf.ehcache.CacheManager; | |||
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; | |||
import org.apache.commons.lang.ArrayUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
@@ -201,6 +202,8 @@ public abstract class AbstractProxyTestCase | |||
delegate.setDelegate( wagonMock ); | |||
CacheManager.getInstance().clearAll(); | |||
log.info( "\n.\\ " + getName() + "() \\._________________________________________\n" ); | |||
} | |||
@@ -20,6 +20,7 @@ package org.apache.maven.archiva.proxy; | |||
*/ | |||
import junit.framework.TestCase; | |||
import net.sf.ehcache.CacheManager; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.maven.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | |||
@@ -158,6 +159,7 @@ public class HttpProxyTransferTest | |||
config.getConfiguration().addRemoteRepository( repoConfig ); | |||
CacheManager.getInstance().clearAll(); | |||
} | |||