You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/07/02 09:37:05 UTC
svn commit: r1356091 [2/4] - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-artifact-converter/
archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/
archiva-modules/archiva-base/archiv...
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java Mon Jul 2 07:36:23 2012
@@ -29,7 +29,6 @@ import org.junit.Test;
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;
@@ -41,13 +40,14 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* RepositoryScannerTest
*
* @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } )
public class RepositoryScannerTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml Mon Jul 2 07:36:23 2012
@@ -52,8 +52,9 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java Mon Jul 2 07:36:23 2012
@@ -29,16 +29,22 @@ import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.runner.RunWith;
/**
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractFileEventTest
extends TestCase
{
protected List<Digester> digesters;
@SuppressWarnings( "unchecked" )
+ @Before
+ @Override
public void setUp()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CopyFileEventTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CopyFileEventTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CopyFileEventTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CopyFileEventTest.java Mon Jul 2 07:36:23 2012
@@ -24,6 +24,9 @@ import org.apache.archiva.common.utils.F
import java.io.File;
import java.io.IOException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
*/
@@ -40,6 +43,8 @@ public class CopyFileEventTest
private String source, oldChecksum;
+ @Override
+ @Before
public void setUp()
throws Exception
{
@@ -67,7 +72,8 @@ public class CopyFileEventTest
oldChecksum = readFile( testDestChecksum );
}
-
+
+ @Test
public void testCopyCommitRollback()
throws Exception
{
@@ -92,6 +98,7 @@ public class CopyFileEventTest
assertChecksumRollback( testDest );
}
+ @Test
public void testCopyCommitRollbackWithBackup()
throws Exception
{
@@ -126,6 +133,7 @@ public class CopyFileEventTest
assertChecksumRollback( testDest );
}
+ @Test
public void testCreateRollbackCommit()
throws Exception
{
@@ -148,7 +156,9 @@ public class CopyFileEventTest
assertTrue( "Test that the destination contents are copied correctly", source.equals( target ) );
}
- protected void tearDown()
+ @After
+ @Override
+ public void tearDown()
throws Exception
{
super.tearDown();
@@ -156,6 +166,7 @@ public class CopyFileEventTest
FileUtils.deleteDirectory( new File( FileUtil.getBasedir(), "target/transaction-tests" ) );
}
+ @Override
protected void assertChecksumCommit( File file )
throws IOException
{
@@ -166,6 +177,7 @@ public class CopyFileEventTest
assertFalse( "Test that the destination checksum contents are created correctly", oldChecksum.equals( target ) );
}
+ @Override
protected void assertChecksumRollback( File file )
throws IOException
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CreateFileEventTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CreateFileEventTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CreateFileEventTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/CreateFileEventTest.java Mon Jul 2 07:36:23 2012
@@ -23,6 +23,8 @@ import java.io.File;
import org.apache.commons.io.FileUtils;
import org.apache.archiva.common.utils.FileUtil;
+import org.junit.After;
+import org.junit.Test;
/**
*/
@@ -31,6 +33,7 @@ public class CreateFileEventTest
{
private File testDir = new File( FileUtil.getBasedir(), "target/transaction-tests/create-file" );
+ @Test
public void testCreateCommitRollback()
throws Exception
{
@@ -56,6 +59,7 @@ public class CreateFileEventTest
assertTrue( "target directory still exists", new File( FileUtil.getBasedir(), "target" ).exists() );
}
+ @Test
public void testCreateCommitRollbackWithBackup()
throws Exception
{
@@ -90,6 +94,7 @@ public class CreateFileEventTest
assertChecksumRollback( testFile );
}
+ @Test
public void testCreateRollbackCommit()
throws Exception
{
@@ -110,7 +115,9 @@ public class CreateFileEventTest
assertChecksumCommit( testFile );
}
- protected void tearDown()
+ @Override
+ @After
+ public void tearDown()
throws Exception
{
super.tearDown();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml Mon Jul 2 07:36:23 2012
@@ -53,6 +53,12 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java Mon Jul 2 07:36:23 2012
@@ -22,12 +22,15 @@ package org.apache.archiva.xml;
import java.io.File;
import junit.framework.TestCase;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.runner.RunWith;
/**
* AbstractArchivaXmlTestCase
*
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractArchivaXmlTestCase
extends TestCase
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java Mon Jul 2 07:36:23 2012
@@ -20,15 +20,20 @@ package org.apache.archiva.xml;
*/
import junit.framework.TestCase;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* LatinEntitiesTest
*
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class LatinEntitiesTest
extends TestCase
{
+ @Test
public void testResolveEntity()
{
// Good Entities.
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java Mon Jul 2 07:36:23 2012
@@ -32,6 +32,7 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringWriter;
import java.net.URL;
+import org.junit.Test;
/**
* LatinEntityResolutionReaderTest
@@ -139,7 +140,8 @@ public class LatinEntityResolutionReader
fail( "IOException: " + e.getMessage() );
}
}
-
+
+ @Test
public void testReaderNormalBufsize()
throws IOException
{
@@ -155,6 +157,7 @@ public class LatinEntityResolutionReader
assertProperRead( expected, "no-prolog-with-entities.xml", 4096 );
}
+ @Test
public void testReaderSmallBufsize()
throws IOException
{
@@ -170,6 +173,7 @@ public class LatinEntityResolutionReader
assertProperRead( expected, "no-prolog-with-entities.xml", 1024 );
}
+ @Test
public void testReaderRediculouslyTinyBufsize()
throws IOException
{
@@ -185,6 +189,7 @@ public class LatinEntityResolutionReader
assertProperRead( expected, "no-prolog-with-entities.xml", 32 );
}
+ @Test
public void testReaderHugeBufsize()
throws IOException
{
@@ -200,7 +205,7 @@ public class LatinEntityResolutionReader
assertProperRead( expected, "no-prolog-with-entities.xml", 409600 );
}
-
+ @Test
public void testReaderLeftOver()
throws IOException
{
@@ -225,7 +230,7 @@ public class LatinEntityResolutionReader
}
}
-
+ @Test
public void testNoLatinEntitiesHugeLine()
{
assertProperRead( "commons-codec-1.2.pom", "commons-codec-1.2.pom", 4096 );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java Mon Jul 2 07:36:23 2012
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.dom4j.Element;
+import org.junit.Test;
/**
* XMLReaderTest
@@ -49,7 +50,8 @@ public class XMLReaderTest
assertTrue( "Contains [" + expectedText + "]", texts.contains( expectedText ) );
}
}
-
+
+ @Test
public void testNoPrologBasicRead()
throws XMLException
{
@@ -60,6 +62,7 @@ public class XMLReaderTest
assertElementTexts( fruits, new String[] { "apple", "cherry", "pear", "peach" } );
}
+ @Test
public void testNoPrologEntitiesRead()
throws XMLException
{
@@ -70,6 +73,7 @@ public class XMLReaderTest
assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
}
+ @Test
public void testNoPrologUtf8Read()
throws XMLException
{
@@ -80,6 +84,7 @@ public class XMLReaderTest
assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
}
+ @Test
public void testPrologUtf8Read()
throws XMLException
{
@@ -91,6 +96,7 @@ public class XMLReaderTest
}
// MRM-1136
+ @Test
public void testProxiedMetadataRead()
throws XMLException
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java Mon Jul 2 07:36:23 2012
@@ -24,6 +24,7 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import java.io.StringWriter;
+import org.junit.Test;
/**
* XMLWriterTest
@@ -33,6 +34,7 @@ import java.io.StringWriter;
public class XMLWriterTest
extends AbstractArchivaXmlTestCase
{
+ @Test
public void testWrite()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Mon Jul 2 07:36:23 2012
@@ -91,7 +91,13 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-admin-default</artifactId>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java Mon Jul 2 07:36:23 2012
@@ -42,7 +42,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import java.io.BufferedInputStream;
@@ -55,11 +54,12 @@ import java.io.IOException;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* ArchivaIndexingTaskExecutorTest
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class ArchivaIndexingTaskExecutorTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java Mon Jul 2 07:36:23 2012
@@ -43,18 +43,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* @author Olivier Lamy
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class DownloadRemoteIndexTaskTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Mon Jul 2 07:36:23 2012
@@ -86,10 +86,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java Mon Jul 2 07:36:23 2012
@@ -31,22 +31,22 @@ import org.junit.After;
import org.junit.Before;
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.File;
import java.util.Calendar;
import java.util.List;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.mock;
/**
* ArchivaRepositoryScanningTaskExecutorPhase1Test
*
- * @version $Id: ArchivaRepositoryScanningTaskExecutorPhase1Test.java 1214303 2011-12-14 15:37:51Z olamy $
+ * @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class ArchivaRepositoryScanningTaskExecutorAbstractTest
extends TestCase
@@ -78,6 +78,7 @@ public abstract class ArchivaRepositoryS
protected MetadataRepository metadataRepository;
@Before
+ @Override
public void setUp()
throws Exception
{
@@ -123,6 +124,7 @@ public abstract class ArchivaRepositoryS
}
@After
+ @Override
public void tearDown()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java Mon Jul 2 07:36:23 2012
@@ -30,9 +30,8 @@ import java.util.Collection;
/**
* ArchivaRepositoryScanningTaskExecutorPhase1Test
*
- * @version $Id: ArchivaRepositoryScanningTaskExecutorPhase1Test.java 1214303 2011-12-14 15:37:51Z olamy $
+ * @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ArchivaRepositoryScanningTaskExecutorPhase1Test
extends ArchivaRepositoryScanningTaskExecutorAbstractTest
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java Mon Jul 2 07:36:23 2012
@@ -36,9 +36,9 @@ import java.util.Date;
/**
* ArchivaRepositoryScanningTaskExecutorPhase2Test
*
- * @version $Id: ArchivaRepositoryScanningTaskExecutorTest.java 1214303 2011-12-14 15:37:51Z olamy $
+ * @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ArchivaRepositoryScanningTaskExecutorPhase2Test
extends ArchivaRepositoryScanningTaskExecutorAbstractTest
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Mon Jul 2 07:36:23 2012
@@ -225,7 +225,12 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java Mon Jul 2 07:36:23 2012
@@ -45,10 +45,13 @@ import javax.ws.rs.core.MediaType;
import java.io.File;
import java.util.Collections;
import java.util.Date;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.runner.RunWith;
/**
* @author Olivier Lamy
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractArchivaRestTest
extends AbstractRestServicesTest
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml Mon Jul 2 07:36:23 2012
@@ -57,6 +57,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java Mon Jul 2 07:36:23 2012
@@ -26,17 +26,17 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* @version
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml"} )
public class RssFeedGeneratorTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java Mon Jul 2 07:36:23 2012
@@ -34,7 +34,6 @@ import org.apache.archiva.rss.RssFeedGen
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
import java.util.ArrayList;
import java.util.Calendar;
@@ -44,8 +43,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
-@RunWith( JUnit4.class )
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class NewArtifactsRssFeedProcessorTest
extends TestCase
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java Mon Jul 2 07:36:23 2012
@@ -29,7 +29,6 @@ import org.easymock.MockControl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
import java.util.Arrays;
import java.util.Collections;
@@ -37,8 +36,9 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
-@RunWith( JUnit4.class )
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class NewVersionsOfArtifactRssFeedProcessorTest
extends TestCase
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml Mon Jul 2 07:36:23 2012
@@ -147,6 +147,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java Mon Jul 2 07:36:23 2012
@@ -38,18 +38,18 @@ import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* AbstractSecurityTest
*
* @version $Id: AbstractSecurityTest
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public abstract class AbstractSecurityTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/RoleManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/RoleManagerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/RoleManagerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/RoleManagerTest.java Mon Jul 2 07:36:23 2012
@@ -24,16 +24,16 @@ import org.apache.archiva.redback.role.R
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* RoleProfilesTest
*
* @version $Id: RoleManagerTest.java 4330 2007-05-10 17:28:56Z jmcconnell $
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class RoleManagerTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Mon Jul 2 07:36:23 2012
@@ -140,6 +140,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java Mon Jul 2 07:36:23 2012
@@ -35,12 +35,12 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
-@RunWith( BlockJUnit4ClassRunner.class )
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RssFeedServletTest
extends TestCase
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Mon Jul 2 07:36:23 2012
@@ -650,7 +650,12 @@
<artifactId>mail</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java Mon Jul 2 07:36:23 2012
@@ -29,10 +29,13 @@ import org.junit.Test;
import java.io.File;
import java.util.Collections;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.runner.RunWith;
/**
* @author Olivier Lamy
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RuntimeInfoServiceTest
extends AbstractRestServicesTest
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Jul 2 07:36:23 2012
@@ -875,7 +875,13 @@
<scope>test</scope>
<version>${project.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<resources>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java Mon Jul 2 07:36:23 2012
@@ -49,10 +49,13 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.context.ContextLoaderListener;
import java.util.Collections;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.runner.RunWith;
/**
* @author Olivier Lamy
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractDownloadTest
extends TestCase
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadArtifactsTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadArtifactsTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadArtifactsTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadArtifactsTest.java Mon Jul 2 07:36:23 2012
@@ -34,7 +34,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,11 +50,12 @@ import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
/**
* @author Olivier Lamy
*/
-@RunWith( JUnit4.class )
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class DownloadArtifactsTest
extends AbstractDownloadTest
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java Mon Jul 2 07:36:23 2012
@@ -37,16 +37,16 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
/**
* @author Olivier Lamy
*/
-@RunWith( JUnit4.class )
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class DownloadMergedIndexTest
extends AbstractDownloadTest
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java Mon Jul 2 07:36:23 2012
@@ -43,7 +43,11 @@ import org.apache.struts2.StrutsSpringTe
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractActionTestCase
extends StrutsSpringTestCase
{
@@ -207,7 +211,8 @@ public abstract class AbstractActionTest
}
@Override
- protected void setUp( )
+ @Before
+ public void setUp( )
throws Exception
{
super.setUp( );
@@ -223,7 +228,8 @@ public abstract class AbstractActionTest
}
@Override
- protected void tearDown( )
+ @After
+ public void tearDown( )
throws Exception
{
super.tearDown( );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java Mon Jul 2 07:36:23 2012
@@ -26,12 +26,14 @@ import org.apache.struts2.StrutsSpringTe
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.runner.RunWith;
/**
* AbstractWebworkTestCase
*
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractWebworkTestCase
extends StrutsSpringTestCase
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java Mon Jul 2 07:36:23 2012
@@ -30,6 +30,7 @@ import org.apache.archiva.scheduler.inde
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -47,7 +48,8 @@ public class BrowseActionTest
private static final String OTHER_TEST_REPO = "other-repo";
- protected void setUp()
+ @Override
+ public void setUp()
throws Exception
{
super.setUp();
@@ -61,7 +63,8 @@ public class BrowseActionTest
factory.setRepositorySession( repositorySession );
}
- protected void tearDown()
+ @Override
+ public void tearDown()
throws Exception
{
super.tearDown();
@@ -69,11 +72,13 @@ public class BrowseActionTest
setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
}
+ @Test
public void testInstantiation()
{
assertFalse( action == getActionProxy( "/browse.action" ).getAction() );
}
+ @Test
public void testBrowse()
throws Exception
{
@@ -92,6 +97,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseNoObservableRepos()
throws Exception
{
@@ -103,6 +109,7 @@ public class BrowseActionTest
assertNoOutputVariables();
}
+ @Test
public void testBrowseGroupNoObservableRepos()
throws Exception
{
@@ -122,6 +129,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseArtifactNoObservableRepos()
throws Exception
{
@@ -143,6 +151,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseGroupNoGroupId()
throws Exception
{
@@ -151,6 +160,7 @@ public class BrowseActionTest
assertNoOutputVariables();
}
+ @Test
public void testBrowseGroupNoArtifacts()
throws Exception
{
@@ -172,6 +182,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseGroupWithArtifacts()
throws Exception
{
@@ -195,6 +206,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseWithCollapsedGroupsAndArtifacts()
throws Exception
{
@@ -217,6 +229,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseWithCollapsedGroupsAndArtifactsAcrossRepositories()
throws Exception
{
@@ -241,6 +254,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseGroupWithCollapsedGroupsAndArtifacts()
throws Exception
{
@@ -266,6 +280,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseArtifactNoGroupId()
throws Exception
{
@@ -284,6 +299,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseArtifactNoArtifactId()
throws Exception
{
@@ -302,6 +318,7 @@ public class BrowseActionTest
assertNull( action.getSharedModel() );
}
+ @Test
public void testBrowseArtifact()
throws Exception
@@ -336,6 +353,7 @@ public class BrowseActionTest
assertDefaultModel( model, selectedGroupId, selectedArtifactId, null );
}
+ @Test
public void testBrowseArtifactWithSnapshots()
throws Exception
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java Mon Jul 2 07:36:23 2012
@@ -44,7 +44,12 @@ import java.util.ArrayList;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class DeleteArtifactActionTest
extends StrutsSpringTestCase
{
@@ -79,7 +84,8 @@ public class DeleteArtifactActionTest
}
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -111,7 +117,8 @@ public class DeleteArtifactActionTest
}
@Override
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
action = null;
@@ -120,6 +127,7 @@ public class DeleteArtifactActionTest
}
+ @Test
public void testNPEInDeleteArtifact()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/SearchActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/SearchActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/SearchActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/SearchActionTest.java Mon Jul 2 07:36:23 2012
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -72,7 +73,7 @@ public class SearchActionTest
private RepositorySession session;
@Override
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -107,6 +108,7 @@ public class SearchActionTest
// quick search...
+ @Test
public void testQuickSearch()
throws Exception
{
@@ -153,6 +155,7 @@ public class SearchActionTest
searchControl.verify();
}
+ @Test
public void testSearchWithinSearchResults()
throws Exception
{
@@ -203,6 +206,7 @@ public class SearchActionTest
searchControl.verify();
}
+ @Test
public void testQuickSearchUserHasNoAccessToAnyRepository()
throws Exception
{
@@ -223,6 +227,7 @@ public class SearchActionTest
userReposControl.verify();
}
+ @Test
public void testQuickSearchNoSearchHits()
throws Exception
{
@@ -258,6 +263,7 @@ public class SearchActionTest
// advanced/filtered search...
+ @Test
public void testAdvancedSearchOneRepository()
throws Exception
{
@@ -305,6 +311,7 @@ public class SearchActionTest
searchControl.verify();
}
+ @Test
public void testAdvancedSearchAllRepositories()
throws Exception
{
@@ -356,6 +363,7 @@ public class SearchActionTest
userReposControl.verify();
}
+ @Test
public void testAdvancedSearchNoSearchHits()
throws Exception
{
@@ -393,6 +401,7 @@ public class SearchActionTest
searchControl.verify();
}
+ @Test
public void testAdvancedSearchUserHasNoAccessToAnyRepository()
throws Exception
{
@@ -406,6 +415,7 @@ public class SearchActionTest
assertEquals(GlobalResults.ACCESS_TO_NO_REPOS, result);
}
+ @Test
public void testAdvancedSearchNoSpecifiedCriteria()
throws Exception
{
@@ -422,6 +432,7 @@ public class SearchActionTest
}
// find artifact..
+ @Test
public void testFindArtifactWithOneHit()
throws Exception
{
@@ -450,6 +461,7 @@ public class SearchActionTest
userReposControl.verify();
}
+ @Test
public void testFindArtifactWithMultipleHits()
throws Exception
{
@@ -478,6 +490,7 @@ public class SearchActionTest
userReposControl.verify();
}
+ @Test
public void testFindArtifactNoChecksumSpecified()
throws Exception
{
@@ -488,6 +501,7 @@ public class SearchActionTest
assertEquals("Unable to search for a blank checksum", (String) action.getActionErrors().iterator().next());
}
+ @Test
public void testFindArtifactNoResults()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java Mon Jul 2 07:36:23 2012
@@ -47,6 +47,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -77,7 +78,8 @@ public class ShowArtifactActionTest
private static final String TEST_TYPE = "jar";
- protected void setUp()
+ @Override
+ public void setUp()
throws Exception
{
super.setUp();
@@ -115,11 +117,13 @@ public class ShowArtifactActionTest
}
+ @Test
public void testInstantiation()
{
assertFalse( action == getActionProxy( "/showArtifact.action" ).getAction() );
}
+ @Test
public void testGetArtifactUniqueRelease()
{
metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
@@ -143,6 +147,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetArtifactUniqueSnapshot()
{
metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
@@ -173,6 +178,7 @@ public class ShowArtifactActionTest
assertNull( action.getMailingLists() );
}
+ @Test
public void testGetArtifactUniqueSnapshotTimestamped()
{
metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
@@ -189,6 +195,7 @@ public class ShowArtifactActionTest
assertNoOutputFields();
}
+ @Test
public void testGetMissingProject()
{
setActionParameters();
@@ -200,6 +207,7 @@ public class ShowArtifactActionTest
assertNoOutputFields();
}
+ @Test
public void testGetArtifactNoObservableRepos()
{
setObservableRepos( Collections.<String>emptyList() );
@@ -214,6 +222,7 @@ public class ShowArtifactActionTest
assertNoOutputFields();
}
+ @Test
public void testGetArtifactNotInObservableRepos()
{
metadataResolver.setProjectVersion( OTHER_TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID,
@@ -228,6 +237,7 @@ public class ShowArtifactActionTest
assertNoOutputFields();
}
+ @Test
public void testGetArtifactOnlySeenInSecondObservableRepo()
{
setObservableRepos( Arrays.asList( OTHER_TEST_REPO, TEST_REPO ) );
@@ -252,6 +262,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetArtifactSeenInBothObservableRepo()
{
setObservableRepos( Arrays.asList( TEST_REPO, OTHER_TEST_REPO ) );
@@ -278,6 +289,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetArtifactCanOnlyObserveInOneOfTwoRepos()
{
setObservableRepos( Arrays.asList( TEST_REPO ) );
@@ -304,6 +316,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetArtifactNoMavenFacet()
{
ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
@@ -335,6 +348,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testMetadataHasRepositoryFacetProblem()
{
String errMsg = "Error in resolving artifact's parent POM file: Sample Parent POM not found";
@@ -360,6 +374,7 @@ public class ShowArtifactActionTest
assertEquals( "Artifact metadata is incomplete: " + errMsg, action.getActionErrors().toArray()[0].toString() );
}
+ @Test
public void testMetadataIncomplete()
{
ProjectVersionMetadata metaData = createProjectModel( TEST_SNAPSHOT_VERSION );
@@ -385,6 +400,7 @@ public class ShowArtifactActionTest
assertEquals( "Artifact metadata is incomplete.", action.getActionErrors().toArray()[0].toString() );
}
+ @Test
public void testGetMailingLists()
{
ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
@@ -413,6 +429,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetDependencies()
{
ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
@@ -441,6 +458,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetDependees()
throws Exception
{
@@ -471,6 +489,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testGetProjectMetadata()
{
ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
@@ -498,6 +517,7 @@ public class ShowArtifactActionTest
assertTrue( action.getArtifacts().isEmpty() );
}
+ @Test
public void testAddAndDeleteMetadataProperty()
{
ProjectVersionMetadata versionMetadata = createProjectModel( TEST_VERSION );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/UploadActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/UploadActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/UploadActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/UploadActionTest.java Mon Jul 2 07:36:23 2012
@@ -52,6 +52,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import org.junit.Test;
/**
* UploadActionTest
@@ -78,6 +79,7 @@ public class UploadActionTest
private ManagedRepository managedRepository;
+ @Override
public void setUp()
throws Exception
{
@@ -116,6 +118,7 @@ public class UploadActionTest
}
+ @Override
public void tearDown()
throws Exception
{
@@ -286,6 +289,7 @@ public class UploadActionTest
return control;
}
+ @Test
public void testArtifactUploadWithPomSuccessful()
throws Exception
{
@@ -327,6 +331,7 @@ public class UploadActionTest
verifyProjectMetadataChecksums( repoLocation );
}
+ @Test
public void testArtifactUploadWithClassifier()
throws Exception
{
@@ -387,6 +392,7 @@ public class UploadActionTest
verifyProjectMetadataChecksums( repoLocation );
}
+ @Test
public void testArtifactUploadGeneratePomSuccessful()
throws Exception
{
@@ -428,6 +434,7 @@ public class UploadActionTest
verifyProjectMetadataChecksums( repoLocation );
}
+ @Test
public void testArtifactUploadNoPomSuccessful()
throws Exception
{
@@ -511,6 +518,7 @@ public class UploadActionTest
assertTrue( StringUtils.contains( contents, md5 ) );
}
+ @Test
public void testArtifactUploadFailedRepositoryNotFound()
throws Exception
{
@@ -548,6 +556,7 @@ public class UploadActionTest
new File( repoLocation, "/org/apache/archiva/artifact-upload/" + MetadataTools.MAVEN_METADATA ).exists() );
}
+ @Test
public void testArtifactUploadSnapshots()
throws Exception
{
@@ -680,6 +689,7 @@ public class UploadActionTest
assertEquals( "Incorrect build number in filename.", "2", buildnumber );
}
+ @Test
public void testChecksumIsCorrectWhenArtifactIsReUploaded()
throws Exception
{
@@ -748,6 +758,7 @@ public class UploadActionTest
verifyProjectMetadataChecksums( repoLocation );
}
+ @Test
public void testUploadArtifactAlreadyExistingRedeploymentsBlocked()
throws Exception
{
@@ -794,6 +805,7 @@ public class UploadActionTest
verifyProjectMetadataChecksums( repoLocation );
}
+ @Test
public void testUploadArtifactAlreadyExistingRedeploymentsAllowed()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java Mon Jul 2 07:36:23 2012
@@ -24,6 +24,7 @@ import org.apache.archiva.configuration.
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.web.action.AbstractWebworkTestCase;
import org.easymock.MockControl;
+import org.junit.Before;
/**
*/
@@ -40,8 +41,9 @@ public abstract class AbstractOrganizati
protected abstract AbstractAppearanceAction getAction();
+ @Before
@Override
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java Mon Jul 2 07:36:23 2012
@@ -28,6 +28,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
/**
*/
@@ -54,6 +56,7 @@ public class EditOrganizationInfoActionT
private ActionValidatorManager actionValidatorManager;
@Override
+ @Before
public void setUp()
throws Exception
{
@@ -64,6 +67,7 @@ public class EditOrganizationInfoActionT
actionValidatorManager = factory.createDefaultActionValidatorManager();
}
+ @Test
public void testOrganisationInfoSaves()
throws Exception
{
@@ -96,6 +100,7 @@ public class EditOrganizationInfoActionT
assertEquals( "URL1", orginfo.getUrl() );
}
+ @Test
public void testStruts2ValidationFrameworkWithNullInputs()
throws Exception
{
@@ -122,6 +127,7 @@ public class EditOrganizationInfoActionT
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithBlankInputs()
throws Exception
{
@@ -148,6 +154,7 @@ public class EditOrganizationInfoActionT
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithInvalidInputs()
throws Exception
{
@@ -184,6 +191,7 @@ public class EditOrganizationInfoActionT
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithValidInputs()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java Mon Jul 2 07:36:23 2012
@@ -20,12 +20,14 @@ package org.apache.archiva.web.action.ad
*/
import org.apache.archiva.configuration.OrganisationInformation;
+import org.junit.Test;
/**
*/
public class OrganizationInfoActionTest
extends AbstractOrganizationInfoActionTest
{
+ @Test
public void testOrganisationInfoLoads()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java Mon Jul 2 07:36:23 2012
@@ -42,6 +42,8 @@ import org.easymock.MockControl;
import java.util.List;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
/**
* AddProxyConnectorActionTest
@@ -58,7 +60,8 @@ public class AddProxyConnectorActionTest
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -75,6 +78,7 @@ public class AddProxyConnectorActionTest
archivaConfiguration );
}
+ @Test
public void testAddBlackListPattern()
throws Exception
{
@@ -106,6 +110,7 @@ public class AddProxyConnectorActionTest
assertEquals( 1, connector.getBlackListPatterns().size() );
}
+ @Test
public void testAddProperty()
throws Exception
{
@@ -139,6 +144,7 @@ public class AddProxyConnectorActionTest
}
@SuppressWarnings( "unchecked" )
+ @Test
public void testAddProxyConnectorCommit()
throws Exception
{
@@ -173,6 +179,7 @@ public class AddProxyConnectorActionTest
assertEquals( "gramov-a-bits", actualConnector.getProperties().get( "eat-a" ) );
}
+ @Test
public void testAddProxyConnectorInitialPage()
throws Exception
{
@@ -194,6 +201,7 @@ public class AddProxyConnectorActionTest
assertEquals( Action.INPUT, status );
}
+ @Test
public void testAddWhiteListPattern()
throws Exception
{
@@ -225,6 +233,7 @@ public class AddProxyConnectorActionTest
assertEquals( 1, connector.getWhiteListPatterns().size() );
}
+ @Test
public void testRemoveBlackListPattern()
throws Exception
{
@@ -271,6 +280,7 @@ public class AddProxyConnectorActionTest
assertEquals( "Should have left 1 blacklist pattern", "**/*.war", connector.getBlackListPatterns().get( 0 ) );
}
+ @Test
public void testRemoveProperty()
throws Exception
{
@@ -317,6 +327,7 @@ public class AddProxyConnectorActionTest
assertEquals( "Should have left 1 property", "general-tso", connector.getProperties().get( "username" ) );
}
+ @Test
public void testRemoveWhiteListPattern()
throws Exception
{
@@ -363,6 +374,7 @@ public class AddProxyConnectorActionTest
assertEquals( "Should have left 1 whitelist pattern", "javax/**/*", connector.getWhiteListPatterns().get( 0 ) );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java Mon Jul 2 07:36:23 2012
@@ -32,7 +32,8 @@ import org.apache.archiva.configuration.
import org.apache.archiva.web.action.AbstractWebworkTestCase;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.easymock.MockControl;
-
+import org.junit.Before;
+import org.junit.Test;
/**
* DeleteProxyConnectorActionTest
*
@@ -52,7 +53,8 @@ public class DeleteProxyConnectorActionT
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -68,7 +70,8 @@ public class DeleteProxyConnectorActionT
( (DefaultProxyConnectorAdmin) action.getProxyConnectorAdmin() ).setArchivaConfiguration(
archivaConfiguration );
}
-
+
+ @Test
public void testConfirmDelete()
throws Exception
{
@@ -84,6 +87,7 @@ public class DeleteProxyConnectorActionT
assertNoErrors( action );
}
+ @Test
public void testConfirmDeleteBadSourceOrTarget()
throws Exception
{
@@ -118,6 +122,7 @@ public class DeleteProxyConnectorActionT
assertHasErrors( action );
}
+ @Test
public void testConfirmDeleteNoSourceOrTarget()
throws Exception
{
@@ -152,6 +157,7 @@ public class DeleteProxyConnectorActionT
assertHasErrors( action );
}
+ @Test
public void testDelete()
throws Exception
{
@@ -177,6 +183,7 @@ public class DeleteProxyConnectorActionT
assertEquals( 0, archivaConfiguration.getConfiguration().getProxyConnectors().size() );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java Mon Jul 2 07:36:23 2012
@@ -31,6 +31,8 @@ import org.apache.archiva.web.action.Abs
import org.apache.archiva.redback.components.registry.RegistryException;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.easymock.MockControl;
+import org.junit.Before;
+import org.junit.Test;
public class DisableProxyConnectorActionTest
extends AbstractWebworkTestCase
@@ -46,7 +48,8 @@ public class DisableProxyConnectorAction
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -62,6 +65,7 @@ public class DisableProxyConnectorAction
( (DefaultProxyConnectorAdmin) action.getProxyConnectorAdmin() ).setArchivaConfiguration( archivaConfiguration );
}
+ @Test
public void testConfirmDisableBadSourceOrTarget()
throws Exception
{
@@ -96,6 +100,7 @@ public class DisableProxyConnectorAction
assertHasErrors( action );
}
+ @Test
public void testConfirmDisableNoSourceOrTarget()
throws Exception
{
@@ -130,6 +135,7 @@ public class DisableProxyConnectorAction
assertHasErrors( action );
}
+ @Test
public void testDelete()
throws Exception
{
@@ -158,6 +164,7 @@ public class DisableProxyConnectorAction
assertTrue( config.isDisabled() );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
@@ -169,6 +176,7 @@ public class DisableProxyConnectorAction
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testConfirmEnable()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java Mon Jul 2 07:36:23 2012
@@ -43,6 +43,8 @@ import org.easymock.MockControl;
import java.util.List;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
/**
* EditProxyConnectorActionTest
@@ -63,7 +65,8 @@ public class EditProxyConnectorActionTes
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -112,6 +115,7 @@ public class EditProxyConnectorActionTes
archivaConfiguration );
}
+ @Test
public void testAddBlackListPattern()
throws Exception
{
@@ -145,6 +149,7 @@ public class EditProxyConnectorActionTes
assertEquals( 1, connector.getBlackListPatterns().size() );
}
+ @Test
public void testAddProperty()
throws Exception
{
@@ -180,6 +185,7 @@ public class EditProxyConnectorActionTes
assertEquals( "gramov-a-bits", connector.getProperties().get( "eat-a" ) );
}
+ @Test
public void testAddWhiteListPattern()
throws Exception
{
@@ -214,6 +220,7 @@ public class EditProxyConnectorActionTes
}
@SuppressWarnings( "unchecked" )
+ @Test
public void testEditProxyConnectorCommit()
throws Exception
{
@@ -250,6 +257,7 @@ public class EditProxyConnectorActionTes
}
+ @Test
public void testEditProxyConnectorInitialPage()
throws Exception
{
@@ -266,6 +274,7 @@ public class EditProxyConnectorActionTes
assertEquals( Action.INPUT, status );
}
+ @Test
public void testRemoveBlackListPattern()
throws Exception
{
@@ -314,6 +323,7 @@ public class EditProxyConnectorActionTes
assertEquals( "Should have left 1 blacklist pattern", "**/*.war", connector.getBlackListPatterns().get( 0 ) );
}
+ @Test
public void testRemoveProperty()
throws Exception
{
@@ -362,6 +372,7 @@ public class EditProxyConnectorActionTes
assertEquals( "Should have left 1 property", "general-tso", connector.getProperties().get( "username" ) );
}
+ @Test
public void testRemoveWhiteListPattern()
throws Exception
{
@@ -410,6 +421,7 @@ public class EditProxyConnectorActionTes
assertEquals( "Should have left 1 whitelist pattern", "javax/**/*", connector.getWhiteListPatterns().get( 0 ) );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java Mon Jul 2 07:36:23 2012
@@ -30,6 +30,8 @@ import org.apache.archiva.configuration.
import org.apache.archiva.web.action.AbstractWebworkTestCase;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.easymock.MockControl;
+import org.junit.Before;
+import org.junit.Test;
public class EnableProxyConnectorActionTest
extends AbstractWebworkTestCase
@@ -45,7 +47,8 @@ public class EnableProxyConnectorActionT
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -69,6 +72,7 @@ public class EnableProxyConnectorActionT
archivaConfiguration.save( config );
}
+ @Test
public void testConfirmDeleteBadSourceOrTarget()
throws Exception
{
@@ -103,6 +107,7 @@ public class EnableProxyConnectorActionT
assertHasErrors( action );
}
+ @Test
public void testConfirmEnableNoSourceOrTarget()
throws Exception
{
@@ -137,6 +142,7 @@ public class EnableProxyConnectorActionT
assertHasErrors( action );
}
+ @Test
public void testEnable()
throws Exception
{
@@ -165,6 +171,7 @@ public class EnableProxyConnectorActionT
assertFalse( config.isDisabled() );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
@@ -176,6 +183,7 @@ public class EnableProxyConnectorActionT
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testConfirmEnable()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java Mon Jul 2 07:36:23 2012
@@ -33,6 +33,8 @@ import org.apache.archiva.web.action.Abs
import org.apache.archiva.redback.components.registry.RegistryException;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.easymock.MockControl;
+import org.junit.Before;
+import org.junit.Test;
/**
* ProxyConnectorsActionTest
@@ -55,7 +57,8 @@ public class ProxyConnectorsActionTest
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -72,6 +75,7 @@ public class ProxyConnectorsActionTest
archivaConfiguration );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
@@ -84,6 +88,7 @@ public class ProxyConnectorsActionTest
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testExecute()
throws Exception
{