Browse Source

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
tags/archiva-1.4-M1
Olivier Lamy 13 years ago
parent
commit
217ae16282

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

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
- 0
archiva-modules/archiva-base/archiva-proxy/pom.xml View File

<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
- 0
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java View File

*/ */


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;


delegate.setDelegate( wagonMock ); delegate.setDelegate( wagonMock );


CacheManager.getInstance().clearAll();

log.info( "\n.\\ " + getName() + "() \\._________________________________________\n" ); log.info( "\n.\\ " + getName() + "() \\._________________________________________\n" );
} }



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

*/ */


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;


config.getConfiguration().addRemoteRepository( repoConfig ); config.getConfiguration().addRemoteRepository( repoConfig );


CacheManager.getInstance().clearAll();


} }



Loading…
Cancel
Save