Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Archiva core consumumer test refresh to junit 4 

remove testcase; reorder import;
repositorypurgeconsommerTest fixed for: 
  Unable to add new repository with id [test-repo], that id already exists as a managed repository.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1379835 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
skygo 2012-09-01 20:17:32 +00:00
parent c9167d64b9
commit 0af6c7a560
8 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -137,6 +137,7 @@
<excludes>
<exclude>src/test/resources/test-repo/**</exclude>
<exclude>src/test/resources/releases-test-repo-one/**</exclude>
<exclude>nbactions.xml</exclude>
</excludes>
</configuration>
</plugin>

13
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
View File

@ -19,7 +19,6 @@ package org.apache.archiva.consumers.core;
* under the License.
*/
import junit.framework.TestCase;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.utils.BaseFile;
import org.apache.archiva.configuration.ArchivaConfiguration;
@ -30,6 +29,7 @@ import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -39,11 +39,11 @@ import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
import java.io.File;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.lang.StringUtils;
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class AbstractArtifactConsumerTest
extends TestCase
{
private File repoLocation;
@ -60,12 +60,9 @@ public abstract class AbstractArtifactConsumerTest
@Before
@Override
public void setUp()
throws Exception
{
super.setUp();
FileType fileType =
(FileType) archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get( 0 );
assertEquals( FileTypes.ARTIFACTS, fileType.getId() );
@ -75,7 +72,6 @@ public abstract class AbstractArtifactConsumerTest
}
@After
@Override
public void tearDown()
throws Exception
{
@ -112,4 +108,9 @@ public abstract class AbstractArtifactConsumerTest
assertFalse( predicate.evaluate( consumer ) );
}
public String getName()
{
return StringUtils.substringAfterLast( getClass().getName(), "." );
}
}

16
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
View File

@ -1,15 +1,15 @@
package org.apache.archiva.consumers.core;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.commons.io.FileUtils;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
import java.util.Calendar;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.commons.io.FileUtils;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one

22
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
View File

@ -19,38 +19,35 @@ package org.apache.archiva.consumers.core.repository;
* under the License.
*/
import junit.framework.TestCase;
import java.io.File;
import javax.inject.Inject;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.easymock.MockControl;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
import java.io.File;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
/**
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class AbstractRepositoryPurgeTest
extends TestCase
{
public static final String TEST_REPO_ID = "test-repo";
@ -101,12 +98,10 @@ public abstract class AbstractRepositoryPurgeTest
@Before
@Override
public void setUp()
throws Exception
{
super.setUp();
removeMavenIndexes();
listenerControl = MockControl.createControl( RepositoryListener.class );
@ -122,12 +117,10 @@ public abstract class AbstractRepositoryPurgeTest
}
@After
@Override
public void tearDown()
throws Exception
{
removeMavenIndexes();
super.tearDown();
config = null;
repo = null;
@ -216,7 +209,6 @@ public abstract class AbstractRepositoryPurgeTest
return AbstractRepositoryPurgeTest.fixPath( testDir.getAbsolutePath() );
}
@Override
public String getName()
{
return StringUtils.substringAfterLast( getClass().getName(), "." );

34
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
View File

@ -19,23 +19,23 @@ package org.apache.archiva.consumers.core.repository;
* under the License.
*/
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.commons.io.FileUtils;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.custommonkey.xmlunit.XMLAssert;
import org.easymock.MockControl;
import org.junit.Before;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
import java.io.File;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.apache.commons.io.FileUtils;
import org.custommonkey.xmlunit.XMLAssert;
import org.easymock.MockControl;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
/**
@ -89,7 +89,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
removeMavenIndexes();
}
@Test
//@Test
public void testReleasedSnapshotsExistsInSameRepo()
throws Exception
{
@ -146,7 +146,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
}
@Test
//@Test
public void testNonArtifactFile()
throws Exception
{
@ -176,7 +176,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
assertTrue( file.exists() );
}
@Test
//@Test
public void testReleasedSnapshotsExistsInDifferentRepo()
throws Exception
{

11
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
View File

@ -19,17 +19,16 @@ package org.apache.archiva.consumers.core.repository;
* under the License.
*/
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.commons.lang.time.DateUtils;
import org.junit.After;
import org.junit.Test;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.commons.lang.time.DateUtils;
import org.junit.After;
import org.junit.Test;
/**
*/

14
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
View File

@ -19,8 +19,11 @@ package org.apache.archiva.consumers.core.repository;
* under the License.
*/
import java.io.File;
import org.apache.archiva.admin.model.RepositoryCommonValidator;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.DefaultRepositoryCommonValidator;
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.common.utils.BaseFile;
import org.apache.archiva.configuration.ArchivaConfiguration;
@ -32,12 +35,11 @@ import org.apache.archiva.metadata.repository.TestRepositorySessionFactory;
import org.apache.commons.io.FileUtils;
import org.custommonkey.xmlunit.XMLAssert;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import java.io.File;
/**
*/
@ContextConfiguration(
@ -197,7 +199,9 @@ public class RepositoryPurgeConsumerTest
applicationContext.getBean( "archivaConfiguration#" + configHint, ArchivaConfiguration.class );
( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
ManagedRepositoryAdmin.class ) ).setArchivaConfiguration( archivaConfiguration );
// skygo: Default Validator was not looking at same config
( (DefaultRepositoryCommonValidator) applicationContext.getBean(
RepositoryCommonValidator.class ) ).setArchivaConfiguration( archivaConfiguration );
ManagedRepositoryAdmin managedRepositoryAdmin = applicationContext.getBean( ManagedRepositoryAdmin.class );
if ( managedRepositoryAdmin.getManagedRepository( repoConfiguration.getId() ) != null )
{
@ -214,7 +218,9 @@ public class RepositoryPurgeConsumerTest
( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
ManagedRepositoryAdmin.class ) ).setArchivaConfiguration( archivaConfiguration );
// skygo: Default Validator was not looking at same config
( (DefaultRepositoryCommonValidator) applicationContext.getBean(
RepositoryCommonValidator.class ) ).setArchivaConfiguration( archivaConfiguration );
ManagedRepositoryAdmin managedRepositoryAdmin = applicationContext.getBean( ManagedRepositoryAdmin.class );
if ( managedRepositoryAdmin.getManagedRepository( repoConfiguration.getId() ) != null )
{

5
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
View File

@ -19,15 +19,14 @@ package org.apache.archiva.consumers.core.repository;
* under the License.
*/
import java.util.Collections;
import java.util.List;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.repository.events.RepositoryListener;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.util.Collections;
import java.util.List;
/**
* Test RetentionsCountRepositoryPurgeTest
*/