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

fix junit : ensure file from previous test is deleted, cleanup connectors before/after each tests 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135264 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-06-13 20:33:20 +00:00
parent 748a97c62f
commit e318df26fc
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
View File

@ -195,6 +195,10 @@ public abstract class AbstractRepositoryServletProxiedTestCase
throws Exception throws Exception
{ {
File destFile = new File( remoteRepo.root, path ); File destFile = new File( remoteRepo.root, path );
if (destFile.exists())
{
destFile.delete();
}
destFile.getParentFile().mkdirs(); destFile.getParentFile().mkdirs();
FileUtils.writeStringToFile( destFile, contents, null ); FileUtils.writeStringToFile( destFile, contents, null );
return destFile; return destFile;

23
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
View File

@ -23,16 +23,17 @@ import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.HttpUnitOptions; import com.meterware.httpunit.HttpUnitOptions;
import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebRequest;
import com.meterware.httpunit.WebResponse; import com.meterware.httpunit.WebResponse;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.policies.SnapshotsPolicy; import org.apache.maven.archiva.policies.SnapshotsPolicy;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.io.File; import java.io.File;
import java.util.ArrayList;
/** /**
* RepositoryServlet Tests, Proxied, Get of Timestamped Snapshot Artifacts, with varying policy settings. * RepositoryServlet Tests, Proxied, Get of Timestamped Snapshot Artifacts, with varying policy settings.
* *
* @version $Id$ * @version $Id$
*/ */
@ -44,6 +45,7 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
public void setup() public void setup()
throws Exception throws Exception
{ {
archivaConfiguration.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>() );
super.setUp(); super.setUp();
} }
@ -51,6 +53,8 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
public void tearDown() public void tearDown()
throws Exception throws Exception
{ {
archivaConfiguration.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>() );
super.tearDown(); super.tearDown();
} }
@ -58,8 +62,8 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
public void testGetProxiedSnapshotsArtifactPolicyAlwaysManagedNewer() public void testGetProxiedSnapshotsArtifactPolicyAlwaysManagedNewer()
throws Exception throws Exception
{ {
assertGetProxiedSnapshotsArtifactWithPolicy( EXPECT_MANAGED_CONTENTS, SnapshotsPolicy.ALWAYS, assertGetProxiedSnapshotsArtifactWithPolicy( EXPECT_MANAGED_CONTENTS, SnapshotsPolicy.ALWAYS, HAS_MANAGED_COPY,
HAS_MANAGED_COPY, ( NEWER * OVER_ONE_DAY ) ); ( NEWER * OVER_ONE_DAY ) );
} }
@Test @Test
@ -104,8 +108,7 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
public void testGetProxiedSnapshotsArtifactPolicyRejectFail() public void testGetProxiedSnapshotsArtifactPolicyRejectFail()
throws Exception throws Exception
{ {
assertGetProxiedSnapshotsArtifactWithPolicy( EXPECT_MANAGED_CONTENTS, SnapshotsPolicy.NEVER, assertGetProxiedSnapshotsArtifactWithPolicy( EXPECT_MANAGED_CONTENTS, SnapshotsPolicy.NEVER, HAS_MANAGED_COPY );
HAS_MANAGED_COPY );
} }
@Test @Test
@ -119,8 +122,7 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
public void testGetProxiedSnapshotsArtifactPolicyRejectPass() public void testGetProxiedSnapshotsArtifactPolicyRejectPass()
throws Exception throws Exception
{ {
assertGetProxiedSnapshotsArtifactWithPolicy( EXPECT_MANAGED_CONTENTS, SnapshotsPolicy.NEVER, assertGetProxiedSnapshotsArtifactWithPolicy( EXPECT_MANAGED_CONTENTS, SnapshotsPolicy.NEVER, HAS_MANAGED_COPY );
HAS_MANAGED_COPY );
} }
@Test @Test
@ -175,7 +177,8 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
} }
private void assertGetProxiedSnapshotsArtifactWithPolicy( int expectation, String snapshotsPolicy, private void assertGetProxiedSnapshotsArtifactWithPolicy( int expectation, String snapshotsPolicy,
boolean hasManagedCopy, long deltaManagedToRemoteTimestamp ) boolean hasManagedCopy,
long deltaManagedToRemoteTimestamp )
throws Exception throws Exception
{ {
// --- Setup // --- Setup
@ -211,7 +214,7 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
case EXPECT_MANAGED_CONTENTS: case EXPECT_MANAGED_CONTENTS:
assertResponseOK( response ); assertResponseOK( response );
assertTrue( "Invalid Test Case: Can't expect managed contents with " assertTrue( "Invalid Test Case: Can't expect managed contents with "
+ "test that doesn't have a managed copy in the first place.", hasManagedCopy ); + "test that doesn't have a managed copy in the first place.", hasManagedCopy );
assertEquals( "Expected managed file contents", expectedManagedContents, response.getText() ); assertEquals( "Expected managed file contents", expectedManagedContents, response.getText() );
break; break;
case EXPECT_REMOTE_CONTENTS: case EXPECT_REMOTE_CONTENTS: