Author: brett
Date: Thu Jun 16 07:44:28 2011
New Revision: 1136309
URL: http://svn.apache.org/viewvc?rev=1136309&view=rev
Log:
use JUnit 4 API
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMappingTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/DefaultPathParserTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
Thu Jun 16 07:44:28 2011
@@ -19,16 +19,17 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
+import org.junit.Rule;
+import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
import java.io.File;
+import javax.inject.Inject;
/**
* AbstractRepositoryLayerTestCase
@@ -38,8 +39,9 @@ import java.io.File;
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class AbstractRepositoryLayerTestCase
- extends TestCase
{
+ @Rule
+ public TestName name = new TestName();
@Inject
protected ApplicationContext applicationContext;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
Thu Jun 16 07:44:28 2011
@@ -25,6 +25,8 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.junit.Test;
+import static org.junit.Assert.*;
+
/**
* AbstractDefaultRepositoryContentTestCase
*
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
Thu Jun 16 07:44:28 2011
@@ -24,6 +24,8 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.junit.Test;
+import static org.junit.Assert.*;
+
/**
* AbstractLegacyRepositoryContentTestCase
*
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMappingTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMappingTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMappingTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMappingTest.java
Thu Jun 16 07:44:28 2011
@@ -29,6 +29,8 @@ import org.junit.Test;
import java.util.Collections;
+import static org.junit.Assert.*;
+
/**
* ArtifactExtensionMappingTest
*
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/DefaultPathParserTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/DefaultPathParserTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/DefaultPathParserTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/DefaultPathParserTest.java
Thu Jun 16 07:44:28 2011
@@ -25,6 +25,8 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.junit.Test;
+import static org.junit.Assert.*;
+
/**
* DefaultPathParserTest
*
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
Thu Jun 16 07:44:28 2011
@@ -31,6 +31,8 @@ import org.junit.Test;
import javax.inject.Inject;
import javax.inject.Named;
+import static org.junit.Assert.*;
+
/**
* LegacyPathParserTest
*
@@ -53,8 +55,6 @@ public class LegacyPathParserTest
public void setUp()
throws Exception
{
- super.setUp();
-
parser = new LegacyPathParser( config );
LegacyArtifactPath jaxen = new LegacyArtifactPath();
jaxen.setPath( "jaxen/jars/jaxen-1.0-FCS-full.jar" );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
Thu Jun 16 07:44:28 2011
@@ -32,14 +32,16 @@ import org.apache.maven.archiva.reposito
import org.junit.Before;
import org.junit.Test;
-import javax.inject.Inject;
-import javax.inject.Named;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import static org.junit.Assert.*;
/**
* ManagedDefaultRepositoryContentTest
@@ -63,8 +65,6 @@ public class ManagedDefaultRepositoryCon
public void setUp()
throws Exception
{
- super.setUp();
-
File repoDir = new File( "src/test/repositories/default-repository" );
ManagedRepositoryConfiguration repository = createRepository(
"testRepo", "Unit Test Repo", repoDir );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
Thu Jun 16 07:44:28 2011
@@ -29,13 +29,15 @@ import org.apache.maven.archiva.reposito
import org.junit.Before;
import org.junit.Test;
-import javax.inject.Inject;
-import javax.inject.Named;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import static org.junit.Assert.*;
/**
* ManagedLegacyRepositoryContentTest
@@ -53,8 +55,6 @@ public class ManagedLegacyRepositoryCont
public void setUp()
throws Exception
{
- super.setUp();
-
File repoDir = new File( "src/test/repositories/legacy-repository" );
ManagedRepositoryConfiguration repository = createRepository(
"testRepo", "Unit Test Repo", repoDir );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
Thu Jun 16 07:44:28 2011
@@ -43,8 +43,6 @@ public class RemoteDefaultRepositoryCont
public void setUp()
throws Exception
{
- super.setUp();
-
RemoteRepositoryConfiguration repository = createRemoteRepository(
"testRemoteRepo", "Unit Test Remote Repo",
"http://repo1.maven.org/maven2/"; );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
Thu Jun 16 07:44:28 2011
@@ -44,8 +44,6 @@ public class RemoteLegacyRepositoryConte
public void setUp()
throws Exception
{
- super.setUp();
-
RemoteRepositoryConfiguration repository =
createRemoteRepository( "testRemoteLegacyRepo", "Unit Test Remote
Legacy Repo",
"http://repo1.maven.org/maven/"; );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
Thu Jun 16 07:44:28 2011
@@ -30,9 +30,11 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
+import java.io.File;
import javax.inject.Inject;
import javax.inject.Named;
-import java.io.File;
+
+import static org.junit.Assert.*;
/**
* RepositoryRequestTest
@@ -55,8 +57,6 @@ public class RepositoryRequestTest
public void setUp()
throws Exception
{
- super.setUp();
-
LegacyPathParser legacyPathParser = new LegacyPathParser(
archivaConfiguration );
repoRequest = new RepositoryRequest( legacyPathParser );
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java?rev=1136309&r1=1136308&r2=1136309&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java
Thu Jun 16 07:44:28 2011
@@ -41,15 +41,17 @@ import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.xml.sax.SAXException;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.xml.parsers.ParserConfigurationException;
+
+import static org.junit.Assert.*;
/**
* MetadataToolsTest
@@ -67,7 +69,6 @@ public class MetadataToolsTest
@Named( value = "archivaConfiguration#mock" )
protected MockConfiguration config;
-
@Test
public void testGatherSnapshotVersionsA()
throws Exception
@@ -355,7 +356,7 @@ public class MetadataToolsTest
reference.setVersion( version );
ManagedRepositoryConfiguration repo =
- createRepository( "test-repo", "Test Repository: " + getName(),
repoRootDir );
+ createRepository( "test-repo", "Test Repository: " +
name.getMethodName(), repoRootDir );
ManagedRepositoryContent repoContent =
applicationContext.getBean( "managedRepositoryContent#default",
ManagedRepositoryContent.class );
repoContent.setRepository( repo );
@@ -574,7 +575,7 @@ public class MetadataToolsTest
private ManagedRepositoryContent createTestRepoContent()
throws Exception
{
- File repoRoot = new File( "target/metadata-tests/" + getName() );
+ File repoRoot = new File( "target/metadata-tests/" +
name.getMethodName() );
if ( repoRoot.exists() )
{
FileUtils.deleteDirectory( repoRoot );
@@ -583,7 +584,7 @@ public class MetadataToolsTest
repoRoot.mkdirs();
ManagedRepositoryConfiguration repoConfig =
- createRepository( "test-repo", "Test Repository: " + getName(),
repoRoot );
+ createRepository( "test-repo", "Test Repository: " +
name.getMethodName(), repoRoot );
ManagedRepositoryContent repoContent =
applicationContext.getBean( "managedRepositoryContent#default",
ManagedRepositoryContent.class );
