Author: brett
Date: Thu Jun 16 07:32:22 2011
New Revision: 1136303
URL: http://svn.apache.org/viewvc?rev=1136303&view=rev
Log:
use JUnit 4 API
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java?rev=1136303&r1=1136302&r2=1136303&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
Thu Jun 16 07:32:22 2011
@@ -19,20 +19,23 @@ package org.apache.maven.archiva.policie
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.common.utils.FileUtil;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
-import javax.inject.Named;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.util.Properties;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import static org.junit.Assert.*;
/**
* ChecksumPolicyTest
@@ -40,18 +43,20 @@ import java.util.Properties;
* @version $Id$
*/
@RunWith( value = SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml",
"classpath*:/spring-context.xml"} )
public class ChecksumPolicyTest
- extends TestCase
{
private static final String GOOD = "good";
private static final String BAD = "bad";
@Inject
- @Named(value="postDownloadPolicy#checksum")
+ @Named( value = "postDownloadPolicy#checksum" )
PostDownloadPolicy downloadPolicy;
+ @Rule
+ public TestName name = new TestName();
+
private PostDownloadPolicy lookupPolicy()
throws Exception
{
@@ -334,7 +339,7 @@ public class ChecksumPolicyTest
throws Exception
{
File sourceDir = getTestFile( "src/test/resources/checksums/" );
- File destDir = getTestFile( "target/checksum-tests/" + getName() + "/"
);
+ File destDir = getTestFile( "target/checksum-tests/" +
name.getMethodName() + "/" );
FileUtils.copyFileToDirectory( new File( sourceDir, "artifact.jar" ),
destDir );