You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2012/08/07 00:17:09 UTC
svn commit: r1370044 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies:
CachedFailuresPolicyTest.java ReleasePolicyTest.java
Author: skygo
Date: Mon Aug 6 22:17:09 2012
New Revision: 1370044
URL: http://svn.apache.org/viewvc?rev=1370044&view=rev
Log:
testPolicyYes rerunnable +@Override in test classes
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java?rev=1370044&r1=1370043&r2=1370044&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java Mon Aug 6 22:17:09 2012
@@ -81,7 +81,7 @@ public class CachedFailuresPolicyTest
policy.applyPolicy( CachedFailuresPolicy.NO, request, localFile );
}
- @Test
+ @Test( expected = PolicyViolationException.class )
public void testPolicyYes()
throws Exception
{
@@ -89,28 +89,21 @@ public class CachedFailuresPolicyTest
DownloadPolicy policy = lookupPolicy();
File localFile = getFile();
Properties request = createRequest();
-
- request.setProperty( "url", "http://a.bad.hostname.maven.org/path/to/resource.txt" );
+ // make unique name
+ String url = "http://a.bad.hostname.maven.org/path/to/resource"+ System.currentTimeMillis() +".txt";
+
+ request.setProperty( "url", url );
// should not fail
policy.applyPolicy( CachedFailuresPolicy.YES, request, localFile );
// status Yes Not In cache
// Yes in Cache
- String url = "http://a.bad.hostname.maven.org/path/to/resource.txt";
-
+
urlFailureCache.cacheFailure( url );
request.setProperty( "url", url );
- try
- {
- policy.applyPolicy( CachedFailuresPolicy.YES, request, localFile );
- fail( "Expected a PolicyViolationException." );
- }
- catch ( PolicyViolationException e )
- {
- // expected path.
- }
+ policy.applyPolicy( CachedFailuresPolicy.YES, request, localFile );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java?rev=1370044&r1=1370043&r2=1370044&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java Mon Aug 6 22:17:09 2012
@@ -368,6 +368,7 @@ public class ReleasePolicyTest
@Before
+ @Override
public void setUp()
throws Exception
{