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 [3/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-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.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/SortProxyConnectorsActionTest.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/SortProxyConnectorsActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java Mon Jul 2 07:36:23 2012
@@ -38,6 +38,8 @@ import org.easymock.MockControl;
import java.util.Collections;
import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
/**
* SortProxyConnectorsActionTest
@@ -62,7 +64,8 @@ public class SortProxyConnectorsActionTe
private ArchivaConfiguration archivaConfiguration;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -90,6 +93,7 @@ public class SortProxyConnectorsActionTe
archivaConfiguration.save( config );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
@@ -101,6 +105,7 @@ public class SortProxyConnectorsActionTe
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testSortDown()
throws Exception
{
@@ -115,6 +120,7 @@ public class SortProxyConnectorsActionTe
assertOrder( new String[]{ JAVAX, CENTRAL, CODEHAUS } );
}
+ @Test
public void testSortDownPastEnd()
throws Exception
{
@@ -131,6 +137,7 @@ public class SortProxyConnectorsActionTe
assertOrder( new String[]{ CENTRAL, JAVAX, CODEHAUS } );
}
+ @Test
public void testSortUp()
throws Exception
{
@@ -145,6 +152,7 @@ public class SortProxyConnectorsActionTe
assertOrder( new String[]{ CENTRAL, CODEHAUS, JAVAX } );
}
+ @Test
public void testSortUpPastBeginning()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.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/legacy/AddLegacyArtifactPathActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java Mon Jul 2 07:36:23 2012
@@ -29,7 +29,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class AddLegacyArtifactPathActionTest
extends TestCase
{
@@ -67,6 +71,7 @@ public class AddLegacyArtifactPathAction
private ActionValidatorManager actionValidatorManager;
@Override
+ @Before
public void setUp()
throws Exception
{
@@ -77,6 +82,7 @@ public class AddLegacyArtifactPathAction
actionValidatorManager = factory.createDefaultActionValidatorManager();
}
+ @Test
public void testStruts2ValidationFrameworkWithNullInputs()
throws Exception
{
@@ -120,6 +126,7 @@ public class AddLegacyArtifactPathAction
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithBlankInputs()
throws Exception
{
@@ -163,6 +170,7 @@ public class AddLegacyArtifactPathAction
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithInvalidInputs()
throws Exception
{
@@ -218,6 +226,7 @@ public class AddLegacyArtifactPathAction
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/networkproxies/ConfigureNetworkProxyActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.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/networkproxies/ConfigureNetworkProxyActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.java Mon Jul 2 07:36:23 2012
@@ -29,7 +29,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ConfigureNetworkProxyActionTest extends TestCase
{
private static final String EMPTY_STRING = "";
@@ -64,6 +68,7 @@ public class ConfigureNetworkProxyAction
private ActionValidatorManager actionValidatorManager;
@Override
+ @Before
public void setUp()
throws Exception
{
@@ -74,6 +79,7 @@ public class ConfigureNetworkProxyAction
actionValidatorManager = factory.createDefaultActionValidatorManager();
}
+ @Test
public void testStruts2ValidationFrameworkWithNullInputs() throws Exception
{
// prep
@@ -107,6 +113,7 @@ public class ConfigureNetworkProxyAction
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
}
+ @Test
public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception
{
// prep
@@ -140,6 +147,7 @@ public class ConfigureNetworkProxyAction
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
}
+ @Test
public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception
{
// prep
@@ -183,6 +191,7 @@ public class ConfigureNetworkProxyAction
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
}
+ @Test
public void testStruts2ValidationFrameworkWithValidInputs() throws Exception
{
// prep
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoryActionTest.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/repositories/AbstractManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -25,7 +25,11 @@ import org.apache.archiva.admin.model.ma
import org.apache.struts2.StrutsSpringTestCase;
import java.io.File;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractManagedRepositoryActionTest
extends StrutsSpringTestCase
{
@@ -71,7 +75,8 @@ public abstract class AbstractManagedRep
}
@Override
- protected void setUp()
+ @Before
+ 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/repositories/AddManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.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/repositories/AddManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -42,6 +42,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
/**
* AddManagedRepositoryActionTest
@@ -71,7 +73,8 @@ public class AddManagedRepositoryActionT
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -111,6 +114,7 @@ public class AddManagedRepositoryActionT
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException
{
@@ -124,6 +128,7 @@ public class AddManagedRepositoryActionT
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testAddRepositoryInitialPage()
throws Exception
{
@@ -153,6 +158,7 @@ public class AddManagedRepositoryActionT
assertFalse( configuration.isSnapshots() );
}
+ @Test
public void testAddRepository()
throws Exception
{
@@ -216,6 +222,7 @@ public class AddManagedRepositoryActionT
}
+ @Test
public void testAddRepositoryExistingLocation()
throws Exception
{
@@ -242,6 +249,7 @@ public class AddManagedRepositoryActionT
registryControl.verify();
}
+ @Test
public void testStruts2ValidationFrameworkWithNullInputs()
throws Exception
{
@@ -277,6 +285,7 @@ public class AddManagedRepositoryActionT
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithBlankInputs()
throws Exception
{
@@ -313,6 +322,7 @@ public class AddManagedRepositoryActionT
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithInvalidInputs()
throws Exception
{
@@ -366,6 +376,7 @@ public class AddManagedRepositoryActionT
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/repositories/AddRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.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/repositories/AddRemoteRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -29,6 +29,8 @@ import org.apache.archiva.redback.integr
import org.easymock.MockControl;
import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
/**
* AddRemoteRepositoryActionTest
@@ -46,7 +48,9 @@ public class AddRemoteRepositoryActionTe
private static final String REPO_ID = "remote-repo-ident";
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -60,6 +64,7 @@ public class AddRemoteRepositoryActionTe
archivaConfiguration );
}
+ @Test
public void testSecureActionBundle()
throws Exception
{
@@ -73,6 +78,7 @@ public class AddRemoteRepositoryActionTe
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testAddRemoteRepositoryInitialPage()
throws Exception
{
@@ -89,6 +95,7 @@ public class AddRemoteRepositoryActionTe
assertEquals( Action.INPUT, status );
}
+ @Test
public void testAddRemoteRepository()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.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/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -53,6 +53,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -89,7 +91,9 @@ public class DeleteManagedRepositoryActi
private MockControl metadataRepositoryControl;
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -129,6 +133,7 @@ public class DeleteManagedRepositoryActi
metadataRepositoryControl.replay();
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException, RepositoryAdminException
{
@@ -142,6 +147,7 @@ public class DeleteManagedRepositoryActi
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testDeleteRepositoryAndReposUnderRepoGroup()
throws Exception
{
@@ -172,6 +178,7 @@ public class DeleteManagedRepositoryActi
metadataRepositoryControl.verify();
}
+ @Test
public void testDeleteRepositoryConfirmation()
throws Exception
{
@@ -207,6 +214,7 @@ public class DeleteManagedRepositoryActi
action.getManagedRepositoryAdmin().getManagedRepositories() );
}
+ @Test
public void testDeleteRepositoryKeepContent()
throws Exception
{
@@ -248,6 +256,7 @@ public class DeleteManagedRepositoryActi
return control;
}
+ @Test
public void testDeleteRepositoryDeleteContent()
throws Exception
{
@@ -275,6 +284,7 @@ public class DeleteManagedRepositoryActi
metadataRepositoryControl.verify();
}
+ @Test
public void testDeleteRepositoryAndAssociatedProxyConnectors()
throws Exception
{
@@ -306,6 +316,7 @@ public class DeleteManagedRepositoryActi
metadataRepositoryControl.verify();
}
+ @Test
public void testDeleteRepositoryCancelled()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.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/repositories/DeleteRemoteRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -33,6 +33,8 @@ import org.apache.archiva.web.action.Abs
import org.easymock.MockControl;
import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
/**
* DeleteRemoteRepositoryActionTest
@@ -50,7 +52,9 @@ public class DeleteRemoteRepositoryActio
private ArchivaConfiguration archivaConfiguration;
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -65,6 +69,7 @@ public class DeleteRemoteRepositoryActio
archivaConfiguration );
}
+ @Test
public void testDeleteRemoteRepositoryConfirmation()
throws Exception
{
@@ -92,6 +97,7 @@ public class DeleteRemoteRepositoryActio
action.getRemoteRepositoryAdmin().getRemoteRepositories() );
}
+ @Test
public void testDeleteRemoteRepository()
throws org.apache.archiva.redback.components.registry.RegistryException, IndeterminateConfigurationException, RepositoryAdminException
{
@@ -123,6 +129,7 @@ public class DeleteRemoteRepositoryActio
assertEquals( 0, configuration.getProxyConnectors().size() );
}
+ @Test
public void testDeleteRemoteRepositoryCancelled()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.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/repositories/DeleteRepositoryGroupActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java Mon Jul 2 07:36:23 2012
@@ -32,6 +32,8 @@ import org.apache.archiva.redback.integr
import org.easymock.MockControl;
import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
/**
* DeleteRepositoryGroupActionTest
@@ -47,7 +49,9 @@ public class DeleteRepositoryGroupAction
private ArchivaConfiguration archivaConfiguration;
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -61,6 +65,7 @@ public class DeleteRepositoryGroupAction
archivaConfiguration );
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException, RepositoryAdminException
{
@@ -74,6 +79,7 @@ public class DeleteRepositoryGroupAction
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testDeleteRepositoryGroupConfirmation()
throws Exception
{
@@ -94,6 +100,7 @@ public class DeleteRepositoryGroupAction
assertEquals( Collections.singletonList( origRepoGroup ), configuration.getRepositoryGroups() );
}
+ @Test
public void testDeleteRepositoryGroup()
throws Exception
{
@@ -118,6 +125,7 @@ public class DeleteRepositoryGroupAction
assertTrue( configuration.getRepositoryGroups().isEmpty() );
}
+ @Test
public void testDeleteRepositoryGroupCancelled()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.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/repositories/EditManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -53,11 +53,17 @@ import java.util.Map;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
/**
* EditManagedRepositoryActionTest
*
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class EditManagedRepositoryActionTest
extends AbstractManagedRepositoryActionTest
{
@@ -82,7 +88,8 @@ public class EditManagedRepositoryAction
private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -133,6 +140,7 @@ public class EditManagedRepositoryAction
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException, RepositoryAdminException
{
@@ -146,6 +154,7 @@ public class EditManagedRepositoryAction
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testEditRepositoryInitialPage()
throws Exception
{
@@ -176,6 +185,7 @@ public class EditManagedRepositoryAction
assertRepositoryEquals( repository, createRepository() );
}
+ @Test
public void testEditRepository()
throws Exception
{
@@ -285,6 +295,7 @@ public class EditManagedRepositoryAction
registryControl.verify();
}
+ @Test
public void testEditRepositoryLocationChanged()
throws Exception
{
@@ -387,6 +398,7 @@ public class EditManagedRepositoryAction
registryControl.verify();
}
+ @Test
public void testStruts2ValidationFrameworkWithNullInputs()
throws Exception
{
@@ -422,6 +434,7 @@ public class EditManagedRepositoryAction
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithBlankInputs()
throws Exception
{
@@ -458,6 +471,7 @@ public class EditManagedRepositoryAction
ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors );
}
+ @Test
public void testStruts2ValidationFrameworkWithInvalidInputs()
throws Exception
{
@@ -511,6 +525,7 @@ public class EditManagedRepositoryAction
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/repositories/EditRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.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/repositories/EditRemoteRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java Mon Jul 2 07:36:23 2012
@@ -33,11 +33,16 @@ import org.easymock.MockControl;
import java.util.Collections;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* EditRemoteRepositoryActionTest
*
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class EditRemoteRepositoryActionTest
extends StrutsSpringTestCase
{
@@ -55,7 +60,9 @@ public class EditRemoteRepositoryActionT
return new String[]{ "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" };
}
- protected void setUp()
+ @Before
+ @Override
+ public void setUp()
throws Exception
{
super.setUp();
@@ -69,6 +76,7 @@ public class EditRemoteRepositoryActionT
archivaConfiguration );
}
+ @Test
public void testEditRemoteRepository()
throws Exception
{
@@ -98,6 +106,7 @@ public class EditRemoteRepositoryActionT
archivaConfigurationControl.verify();
}
+ @Test
public void testEditRemoteRepositoryInitialPage()
throws Exception
{
@@ -121,6 +130,7 @@ public class EditRemoteRepositoryActionT
assertRepositoryEquals( repository, createRepository() );
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException, RepositoryAdminException
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.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/repositories/RepositoriesActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.java Mon Jul 2 07:36:23 2012
@@ -41,10 +41,15 @@ import java.util.Arrays;
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;
/**
* Test the repositories action returns the correct data.
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoriesActionTest
extends StrutsSpringTestCase
{
@@ -54,7 +59,9 @@ public class RepositoriesActionTest
ArchivaConfiguration originalArchivaConfiguration;
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
throws Exception
{
@@ -73,7 +80,8 @@ public class RepositoriesActionTest
@Override
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
super.tearDown();
@@ -91,6 +99,7 @@ public class RepositoriesActionTest
return new String[]{ "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" };
}
+ @Test
public void testGetRepositories()
throws Exception
{
@@ -145,6 +154,7 @@ public class RepositoriesActionTest
}
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.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/repositories/RepositoryGroupsActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java Mon Jul 2 07:36:23 2012
@@ -37,6 +37,7 @@ import org.easymock.MockControl;
import java.util.Collections;
import java.util.List;
+import org.junit.Test;
/**
* RepositoryGroupsActionTest
@@ -56,7 +57,8 @@ public class RepositoryGroupsActionTest
private ArchivaConfiguration archivaConfiguration;
- protected void setUp()
+ @Override
+ public void setUp()
throws Exception
{
super.setUp();
@@ -72,6 +74,7 @@ public class RepositoryGroupsActionTest
archivaConfiguration );
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException, RepositoryAdminException
{
@@ -85,6 +88,7 @@ public class RepositoryGroupsActionTest
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testAddRepositoryGroup()
throws Exception
{
@@ -108,6 +112,7 @@ public class RepositoryGroupsActionTest
archivaConfigurationControl.verify();
}
+ @Test
public void testAddEmptyRepositoryGroup()
throws Exception
{
@@ -127,6 +132,7 @@ public class RepositoryGroupsActionTest
assertEquals( 0, configuration.getRepositoryGroups().size() );
}
+ @Test
public void testAddDuplicateRepositoryGroup()
throws Exception
{
@@ -156,6 +162,7 @@ public class RepositoryGroupsActionTest
action.getRepositoryGroupAdmin().getRepositoriesGroups() );
}
+ @Test
public void testGetRepositoryGroups()
throws Exception
{
@@ -191,6 +198,7 @@ public class RepositoryGroupsActionTest
assertEquals( REPO2_ID, repos.get( 0 ) );
}
+ @Test
public void testAddRepositoryToGroup()
throws Exception
{
@@ -240,6 +248,7 @@ public class RepositoryGroupsActionTest
assertNull( action.getGroupToRepositoryMap().get( repoGroup.getId() ) );
}
+ @Test
public void testRemoveRepositoryFromGroup()
throws Exception
{
@@ -291,6 +300,7 @@ public class RepositoryGroupsActionTest
assertEquals( REPO2_ID, repos.get( 1 ) );
}
+ @Test
public void testAddDuplicateRepositoryToGroup()
throws Exception
{
@@ -327,6 +337,7 @@ public class RepositoryGroupsActionTest
assertEquals( Action.ERROR, result );
}
+ @Test
public void testRemoveRepositoryNotInGroup()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.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/repositories/SortRepositoriesActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java Mon Jul 2 07:36:23 2012
@@ -28,9 +28,15 @@ import org.apache.archiva.redback.integr
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.easymock.MockControl;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* SortRepositoriesActionTest
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class SortRepositoriesActionTest
extends StrutsSpringTestCase
{
@@ -56,7 +62,9 @@ public class SortRepositoriesActionTest
return new String[]{ "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" };
}
- protected void setUp()
+ @Before
+ @Override
+ public void setUp()
throws Exception
{
super.setUp();
@@ -68,13 +76,15 @@ public class SortRepositoriesActionTest
}
@Override
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
super.tearDown();
action.archivaConfiguration = originalArchivaConfiguration;
}
+ @Test
public void testSecureActionBundle()
throws SecureActionException
{
@@ -87,6 +97,7 @@ public class SortRepositoriesActionTest
assertEquals( 1, bundle.getAuthorizationTuples().size() );
}
+ @Test
public void testSortDownFirstRepository()
throws Exception
{
@@ -121,6 +132,7 @@ public class SortRepositoriesActionTest
assertEquals( REPO3_ID, repositories.get( 2 ) );
}
+ @Test
public void testSortDownLastRepository()
throws Exception
{
@@ -155,6 +167,7 @@ public class SortRepositoriesActionTest
assertEquals( REPO3_ID, repositories.get( 2 ) );
}
+ @Test
public void testSortUpLastRepository()
throws Exception
{
@@ -189,6 +202,7 @@ public class SortRepositoriesActionTest
assertEquals( REPO2_ID, repositories.get( 2 ) );
}
+ @Test
public void testSortUpFirstRepository()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningActionTest.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/scanning/RepositoryScanningActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningActionTest.java Mon Jul 2 07:36:23 2012
@@ -9,6 +9,8 @@ import org.easymock.MockControl;
import java.util.ArrayList;
import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -40,7 +42,9 @@ public class RepositoryScanningActionTes
private Configuration config;
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
throws Exception
{
@@ -65,6 +69,7 @@ public class RepositoryScanningActionTes
}
+ @Test
public void testUpdateKnownConsumers()
throws Exception
{
@@ -90,6 +95,7 @@ public class RepositoryScanningActionTes
assertEquals( "results " + results, 8, results.size() );
}
+ @Test
public void testDisableAllKnownConsumers()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/reports/GenerateReportActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/reports/GenerateReportActionTest.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/reports/GenerateReportActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/reports/GenerateReportActionTest.java Mon Jul 2 07:36:23 2012
@@ -44,6 +44,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -76,7 +77,7 @@ public class GenerateReportActionTest
@Override
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -101,6 +102,8 @@ public class GenerateReportActionTest
factory.setRepositorySession( repositorySession );
}
+
+ @Override
@After
public void tearDown()
throws Exception
@@ -149,6 +152,7 @@ public class GenerateReportActionTest
assertEquals( availableRepositories, action.getAvailableRepositories() );
}
+ @Test
public void testGenerateStatisticsInvalidRowCount()
throws Exception
{
@@ -162,6 +166,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsInvalidEndDate()
throws Exception
{
@@ -176,6 +181,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsMalformedEndDate()
throws Exception
{
@@ -191,6 +197,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsInvalidEndDateMultiRepo()
throws Exception
{
@@ -205,6 +212,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsMalformedEndDateMultiRepo()
throws Exception
{
@@ -220,6 +228,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsNoRepos()
throws Exception
{
@@ -232,6 +241,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsSingleRepo()
throws Exception
{
@@ -247,6 +257,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsSingleRepoNoStats()
throws Exception
@@ -264,6 +275,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsOvershotPages()
throws Exception
@@ -281,6 +293,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsMultipleRepoNoResults()
throws Exception
@@ -303,6 +316,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testGenerateStatisticsMultipleRepo()
throws Exception
@@ -322,6 +336,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsSingleRepo()
throws Exception
{
@@ -344,6 +359,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsMultipleRepos()
throws Exception
{
@@ -365,6 +381,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsMalformedEndDateMultiRepo()
throws Exception
{
@@ -380,6 +397,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsMalformedEndDateSingleRepo()
throws Exception
{
@@ -395,6 +413,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsInvalidEndDateMultiRepo()
throws Exception
{
@@ -409,6 +428,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsInvalidEndDateSingleRepo()
throws Exception
{
@@ -423,6 +443,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsSingleRepoNoStats()
throws Exception
@@ -439,6 +460,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsNoRepos()
throws Exception
{
@@ -451,6 +473,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsMultipleRepoNoResults()
throws Exception
@@ -472,6 +495,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testDownloadStatisticsMultipleRepoInStrutsFormat()
throws Exception
{
@@ -494,6 +518,7 @@ public class GenerateReportActionTest
repositoryStatisticsManagerControl.verify();
}
+ @Test
public void testHealthReportSingleRepo()
throws Exception
{
@@ -524,6 +549,7 @@ public class GenerateReportActionTest
metadataRepositoryControl.verify();
}
+ @Test
public void testHealthReportInvalidRowCount()
throws Exception
{
@@ -542,6 +568,7 @@ public class GenerateReportActionTest
metadataRepositoryControl.verify();
}
+ @Test
public void testHealthReportAllRepos()
throws Exception
{
@@ -576,6 +603,7 @@ public class GenerateReportActionTest
metadataRepositoryControl.verify();
}
+ @Test
public void testHealthReportSingleRepoByCorrectGroupId()
throws Exception
{
@@ -606,6 +634,7 @@ public class GenerateReportActionTest
metadataRepositoryControl.verify();
}
+ @Test
public void testHealthReportSingleRepoByCorrectGroupIdAllRepositories()
throws Exception
{
@@ -641,6 +670,7 @@ public class GenerateReportActionTest
metadataRepositoryControl.verify();
}
+ @Test
public void testHealthReportSingleRepoByIncorrectGroupId()
throws Exception
{
@@ -681,6 +711,7 @@ public class GenerateReportActionTest
return problem;
}
+ @Test
public void testHealthReportNoRepositoryId()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java Mon Jul 2 07:36:23 2012
@@ -27,12 +27,15 @@ import java.util.zip.GZIPInputStream;
import org.apache.commons.io.IOUtils;
import junit.framework.TestCase;
-
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* BannerTest
*
* @version $Id$
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class BannerTest
extends TestCase
{
@@ -43,14 +46,16 @@ public class BannerTest
assertEquals( "Encoding: ", encoded, Banner.encode( decoded ) );
assertEquals( "Decoding: ", decoded, Banner.decode( encoded ) );
}
-
+
+ @Test
public void testEncodeDecode()
{
assertEncodeDecode( "[$10 ]", "[ ]" );
assertEncodeDecode( "$$$5_$n$5_", "$_____" + eol + "_____" );
assertEncodeDecode( "$${Refgjuvyr}", "${Erstwhile}" );
}
-
+
+ @Test
public void testInjectVersion()
{
assertEquals( "[ 1.0 ]", Banner.injectVersion( "[#####]", "1.0" ) );
@@ -60,6 +65,7 @@ public class BannerTest
Banner.injectVersion( "Archiva:\"+eol+\" (##############)", "1.0-alpha-1" ) );
}
+ @Test
public void testGetBanner()
throws IOException
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java Mon Jul 2 07:36:23 2012
@@ -42,15 +42,15 @@ 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 java.util.List;
import javax.inject.Inject;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml",
"classpath:/spring-context-DependencyTreeTest.xml"} )
public class DependencyTreeTest
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Mon Jul 2 07:36:23 2012
@@ -185,6 +185,12 @@
</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>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java Mon Jul 2 07:36:23 2012
@@ -40,19 +40,19 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* AbstractRepositoryServletTestCase
*
* @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/repository-servlet-simple.xml" } )
public abstract class AbstractRepositoryServletTestCase
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java Mon Jul 2 07:36:23 2012
@@ -50,18 +50,18 @@ 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;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* ArchivaDavResourceFactoryTest
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class ArchivaDavResourceFactoryTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceLocatorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceLocatorTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceLocatorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceLocatorTest.java Mon Jul 2 07:36:23 2012
@@ -20,22 +20,29 @@ package org.apache.archiva.webdav;
*/
import junit.framework.TestCase;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ArchivaDavResourceLocatorTest
extends TestCase
{
ArchivaDavLocatorFactory factory;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
factory = new ArchivaDavLocatorFactory();
}
+ @Test
public void testAvoidDoubleSlashInHref()
throws Exception
{
@@ -53,6 +60,7 @@ public class ArchivaDavResourceLocatorTe
assertEquals( "/repository/internal", locator.getRepositoryPath() );
}
+ @Test
public void testLocatorWithPrefixHref()
throws Exception
{
@@ -70,6 +78,7 @@ public class ArchivaDavResourceLocatorTe
assertEquals( "/repository/internal", locator.getRepositoryPath() );
}
+ @Test
public void testLocatorWithHrefThatContainsPrefix()
throws Exception
{
@@ -87,6 +96,7 @@ public class ArchivaDavResourceLocatorTe
assertEquals( "/repository/internal", locator.getRepositoryPath() );
}
+ @Test
public void testLocatorWithRootHref()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java Mon Jul 2 07:36:23 2012
@@ -48,7 +48,12 @@ import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ArchivaDavSessionProviderTest
extends TestCase
{
@@ -57,7 +62,8 @@ public class ArchivaDavSessionProviderTe
private WebdavRequest request;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -65,6 +71,7 @@ public class ArchivaDavSessionProviderTe
request = new WebdavRequestImpl( new HttpServletRequestMock(), null );
}
+ @Test
public void testAttachSession()
throws Exception
{
@@ -73,6 +80,7 @@ public class ArchivaDavSessionProviderTe
assertNotNull( request.getDavSession() );
}
+ @Test
public void testReleaseSession()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionTest.java Mon Jul 2 07:36:23 2012
@@ -21,8 +21,14 @@ package org.apache.archiva.webdav;
import junit.framework.TestCase;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ArchivaDavSessionTest extends TestCase
{
+ @Test
public void testTokens()
{
ArchivaDavSession session = new ArchivaDavSession();
@@ -36,6 +42,7 @@ public class ArchivaDavSessionTest exten
assertEquals(0, session.getLockTokens().length);
}
+ @Test
public void testAddReferencesThrowsUnsupportedOperationException()
{
ArchivaDavSession session = new ArchivaDavSession();
@@ -50,6 +57,7 @@ public class ArchivaDavSessionTest exten
}
}
+ @Test
public void testRemoveReferencesThrowsUnsupportedOperationException()
{
ArchivaDavSession session = new ArchivaDavSession();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java Mon Jul 2 07:36:23 2012
@@ -42,13 +42,13 @@ 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.File;
import java.util.Collections;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class DavResourceTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java Mon Jul 2 07:36:23 2012
@@ -24,16 +24,16 @@ import org.apache.archiva.webdav.util.Mi
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;
/**
* ArchivaMimeTypesTest
*
* @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class MimeTypesLoaderTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java Mon Jul 2 07:36:23 2012
@@ -54,13 +54,13 @@ 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 javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
/**
* RepositoryServletSecurityTest Test the flow of the authentication and authorization checks. This does not necessarily
@@ -68,7 +68,7 @@ import java.io.InputStream;
*
* @version $Id$
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class RepositoryServletSecurityTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MimeTypesTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MimeTypesTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MimeTypesTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MimeTypesTest.java Mon Jul 2 07:36:23 2012
@@ -23,16 +23,16 @@ import junit.framework.TestCase;
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;
/**
* MimeTypesTest
*
* @version $Id: MimeTypesTest.java 6556 2007-06-20 20:44:46Z joakime $
*/
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class MimeTypesTest
extends TestCase
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java Mon Jul 2 07:36:23 2012
@@ -20,12 +20,17 @@ package org.apache.archiva.webdav.util;
*/
import junit.framework.TestCase;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
*/
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoryPathUtilTest
extends TestCase
{
+ @Test
public void testGetRepositoryId()
{
String href = "/path/to/my/resource";
@@ -38,6 +43,7 @@ public class RepositoryPathUtilTest
assertEquals( "/", RepositoryPathUtil.getLogicalResource( href ) );
}
+ @Test
public void testGetLogicalPath()
{
String href = "/repository/internal/org/apache/maven/someartifact.jar";
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml Mon Jul 2 07:36:23 2012
@@ -49,10 +49,11 @@
<artifactId>archiva-repository-admin-api</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-testutil</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java Mon Jul 2 07:36:23 2012
@@ -38,7 +38,6 @@ 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 java.util.ArrayList;
import java.util.Arrays;
@@ -49,8 +48,9 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public abstract class AbstractMetadataRepositoryTest
extends TestCase
Modified: archiva/trunk/archiva-modules/plugins/audit/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/audit/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/audit/pom.xml Mon Jul 2 07:36:23 2012
@@ -37,10 +37,11 @@
<artifactId>metadata-repository-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>
</dependencies>
<build>
Modified: archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java Mon Jul 2 07:36:23 2012
@@ -35,7 +35,12 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class AuditManagerTest
extends TestCase
{
@@ -69,7 +74,8 @@ public class AuditManagerTest
}
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -83,7 +89,8 @@ public class AuditManagerTest
repository.setId( TEST_REPO_ID );
repository.setLocation( "" );
}
-
+
+ @Test
public void testGetMostRecentEvents()
throws Exception
{
@@ -122,6 +129,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetMostRecentEventsLessThan10()
throws Exception
{
@@ -159,6 +167,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetMostRecentEventsInterleavedRepositories()
throws Exception
{
@@ -207,6 +216,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetMostRecentEventsWhenEmpty()
throws Exception
@@ -222,6 +232,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testAddAuditEvent()
throws Exception
@@ -237,6 +248,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testAddAuditEventNoRepositoryId()
throws Exception
{
@@ -252,6 +264,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testDeleteStats()
throws Exception
@@ -265,6 +278,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsRangeInside()
throws Exception
@@ -298,6 +312,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsRangeUpperOutside()
throws Exception
{
@@ -335,6 +350,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsRangeLowerOutside()
throws Exception
{
@@ -372,6 +388,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsRangeLowerAndUpperOutside()
throws Exception
{
@@ -415,6 +432,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsWithResource()
throws Exception
{
@@ -458,6 +476,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsWithNonExistantResource()
throws Exception
{
@@ -497,6 +516,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsRangeMultipleRepositories()
throws Exception
{
@@ -546,6 +566,7 @@ public class AuditManagerTest
metadataRepositoryControl.verify();
}
+ @Test
public void testGetEventsRangeNotInside()
throws Exception
{
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Mon Jul 2 07:36:23 2012
@@ -129,8 +129,9 @@
<scope>test</scope>
</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/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java Mon Jul 2 07:36:23 2012
@@ -34,14 +34,14 @@ 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 javax.inject.Named;
import java.io.File;
import java.util.Collections;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
public class DependencyTreeBuilderTest
extends TestCase
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java Mon Jul 2 07:36:23 2012
@@ -55,11 +55,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class Maven2RepositoryMetadataResolverTest
extends TestCase
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java Mon Jul 2 07:36:23 2012
@@ -31,13 +31,14 @@ import org.junit.runners.JUnit4;
import java.io.File;
import java.util.Arrays;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
/**
* RepositoryMetadataReaderTest
*
* @version $Id$
*/
-@RunWith( JUnit4.class )
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class MavenRepositoryMetadataReaderTest
extends TestCase
{
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml Mon Jul 2 07:36:23 2012
@@ -56,6 +56,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>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml Mon Jul 2 07:36:23 2012
@@ -44,10 +44,11 @@
<scope>test</scope>
</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>javax.jcr</groupId>
<artifactId>jcr</artifactId>
Modified: archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml Mon Jul 2 07:36:23 2012
@@ -54,10 +54,11 @@
<artifactId>archiva-consumer-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/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java Mon Jul 2 07:36:23 2012
@@ -36,7 +36,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Matchers;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import javax.inject.Named;
@@ -44,11 +43,12 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.util.Arrays;
import java.util.Date;
+import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.*;
@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
-@RunWith( SpringJUnit4ClassRunner.class )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class DuplicateArtifactsConsumerTest
extends TestCase
Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml Mon Jul 2 07:36:23 2012
@@ -50,10 +50,11 @@
<artifactId>jackrabbit-jcr-commons</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.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java Mon Jul 2 07:36:23 2012
@@ -39,9 +39,14 @@ import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.zip.GZIPInputStream;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
import static org.mockito.Mockito.*;
-
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class JcrRepositoryStatisticsGatheringTest
extends TestCase
{
@@ -58,7 +63,8 @@ public class JcrRepositoryStatisticsGath
private Session session;
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -100,7 +106,8 @@ public class JcrRepositoryStatisticsGath
}
@Override
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
session.logout();
@@ -108,6 +115,7 @@ public class JcrRepositoryStatisticsGath
super.tearDown();
}
+ @Test
public void testJcrStatisticsQuery()
throws Exception
{
Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java Mon Jul 2 07:36:23 2012
@@ -35,7 +35,12 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import javax.jcr.Session;
+import org.apache.archiva.test.ArchivaBlockJUnit4ClassRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoryStatisticsManagerTest
extends TestCase
{
@@ -63,7 +68,8 @@ public class RepositoryStatisticsManager
}
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -74,6 +80,7 @@ public class RepositoryStatisticsManager
metadataRepository = (MetadataRepository) metadataRepositoryControl.getMock();
}
+ @Test
public void testGetLatestStats()
throws Exception
{
@@ -113,6 +120,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testGetLatestStatsWhenEmpty()
throws Exception
{
@@ -127,6 +135,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testAddNewStats()
throws Exception
{
@@ -165,6 +174,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testDeleteStats()
throws Exception
{
@@ -210,6 +220,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testDeleteStatsWhenEmpty()
throws Exception
{
@@ -229,6 +240,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testGetStatsRangeInside()
throws Exception
{
@@ -272,6 +284,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testGetStatsRangeUpperOutside()
throws Exception
{
@@ -320,6 +333,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testGetStatsRangeLowerOutside()
throws Exception
{
@@ -368,6 +382,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testGetStatsRangeLowerAndUpperOutside()
throws Exception
{
@@ -422,6 +437,7 @@ public class RepositoryStatisticsManager
metadataRepositoryControl.verify();
}
+ @Test
public void testGetStatsRangeNotInside()
throws Exception
{
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1356091&r1=1356090&r2=1356091&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Mon Jul 2 07:36:23 2012
@@ -86,6 +86,12 @@
<artifactId>wagon-http-lightweight</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>
<plugins>