Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix unit test in archiva-proxy cache url failure clear between tests 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133396 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-06-08 13:32:25 +00:00
parent 95dde31389
commit 217ae16282
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
View File

@ -267,7 +267,7 @@ public class ChecksummedFile
String rawChecksum = FileUtils.readFileToString( checksumFile ); String rawChecksum = FileUtils.readFileToString( checksumFile );
String expectedChecksum = parseChecksum( rawChecksum, checksumAlgorithm, referenceFile.getName() ); String expectedChecksum = parseChecksum( rawChecksum, checksumAlgorithm, referenceFile.getName() );
if ( StringUtils.equalsIgnoreCase( expectedChecksum, actualChecksum ) == false ) if ( ! StringUtils.equalsIgnoreCase( expectedChecksum, actualChecksum ) )
{ {
// create checksum (again) // create checksum (again)
FileUtils.writeStringToFile( checksumFile, actualChecksum + " " + referenceFile.getName() ); FileUtils.writeStringToFile( checksumFile, actualChecksum + " " + referenceFile.getName() );

13
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -111,4 +111,17 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>

3
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
View File

@ -20,6 +20,7 @@ package org.apache.maven.archiva.proxy;
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.ehcache.CacheManager;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -201,6 +202,8 @@ public abstract class AbstractProxyTestCase
delegate.setDelegate( wagonMock ); delegate.setDelegate( wagonMock );
CacheManager.getInstance().clearAll();
log.info( "\n.\\ " + getName() + "() \\._________________________________________\n" ); log.info( "\n.\\ " + getName() + "() \\._________________________________________\n" );
} }

2
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java
View File

@ -20,6 +20,7 @@ package org.apache.maven.archiva.proxy;
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.ehcache.CacheManager;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@ -158,6 +159,7 @@ public class HttpProxyTransferTest
config.getConfiguration().addRemoteRepository( repoConfig ); config.getConfiguration().addRemoteRepository( repoConfig );
CacheManager.getInstance().clearAll();
} }