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 2013/11/13 07:31:25 UTC
svn commit: r1541399 [1/4] - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva...
Author: olamy
Date: Wed Nov 13 06:31:24 2013
New Revision: 1541399
URL: http://svn.apache.org/r1541399
Log:
move to last easymock 3.2
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchOSGITest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java Wed Nov 13 06:31:24 2013
@@ -19,18 +19,11 @@ package org.apache.archiva.configuration
* under the License.
*/
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.redback.components.registry.RegistryException;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
import org.custommonkey.xmlunit.XMLAssert;
-import org.easymock.MockControl;
-import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -40,6 +33,15 @@ import org.springframework.test.annotati
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
+import javax.inject.Inject;
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Map;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
/**
* Test the configuration store.
*/
@@ -215,18 +217,21 @@ public class ArchivaConfigurationTest
configuration.getWebapp().getUi().setAppletFindEnabled( false );
// add a change listener
- MockControl control = createConfigurationListenerMockControl();
- ConfigurationListener listener = (ConfigurationListener) control.getMock();
+ //MockControl control = createConfigurationListenerMockControl();
+ ConfigurationListener listener = createMock( ConfigurationListener.class );// (ConfigurationListener) control.getMock();
archivaConfiguration.addListener( listener );
listener.configurationEvent( new ConfigurationEvent( ConfigurationEvent.SAVED ) );
- control.setVoidCallable();
+ //control.setVoidCallable();
+
- control.replay();
+ //control.replay();
+ replay( listener );
archivaConfiguration.save( configuration );
- control.verify();
+ //control.verify();
+ verify( listener );
assertTrue( "Check file exists", file.exists() );
@@ -242,9 +247,9 @@ public class ArchivaConfigurationTest
assertFalse( "check value", configuration.getWebapp().getUi().isAppletFindEnabled() );
}
- private static MockControl createConfigurationListenerMockControl()
+ private static ConfigurationListener createConfigurationListenerMockControl()
{
- return MockControl.createControl( ConfigurationListener.class );
+ return createMock( ConfigurationListener.class );// MockControl.createControl( ConfigurationListener.class );
}
@Test
@@ -301,19 +306,24 @@ public class ArchivaConfigurationTest
configuration.getWebapp().getUi().setAppletFindEnabled( false );
// add a change listener
- MockControl control = createConfigurationListenerMockControl();
- ConfigurationListener listener = (ConfigurationListener) control.getMock();
+ //MockControl control = createConfigurationListenerMockControl();
+ //ConfigurationListener listener = (ConfigurationListener) control.getMock();
+ ConfigurationListener listener = createConfigurationListenerMockControl();
archivaConfiguration.addListener( listener );
listener.configurationEvent( new ConfigurationEvent( ConfigurationEvent.SAVED ) );
- control.setVoidCallable( 1 );
+ //control.setVoidCallable( 1 );
- control.replay();
+ //control.replay();
+
+ replay( listener );
archivaConfiguration.save( configuration );
- control.verify();
+ //control.verify();
+
+ verify( listener );
assertTrue( "Check file exists", userFile.exists() );
assertFalse( "Check file not created", baseFile.exists() );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java Wed Nov 13 06:31:24 2013
@@ -32,7 +32,8 @@ 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.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
@@ -82,7 +83,7 @@ public abstract class AbstractRepository
protected RepositoryPurge repoPurge;
- protected MockControl listenerControl;
+ protected IMocksControl listenerControl;
protected RepositoryListener listener;
@@ -104,9 +105,9 @@ public abstract class AbstractRepository
removeMavenIndexes();
- listenerControl = MockControl.createControl( RepositoryListener.class );
+ listenerControl = EasyMock.createControl( );
- listener = (RepositoryListener) listenerControl.getMock();
+ listener = listenerControl.createMock( RepositoryListener.class );
repositorySession = mock( RepositorySession.class );
metadataRepository = mock( MetadataRepository.class );
@@ -195,7 +196,7 @@ public abstract class AbstractRepository
throws Exception
{
removeMavenIndexes();
- File testDir = new File( AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot().getAbsolutePath() ) ) ;// AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot() );
+ File testDir = new File( AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot().getAbsolutePath() ) );
FileUtils.deleteDirectory( testDir );
File sourceDir = new File ( new File( "target/test-classes/" + TEST_REPO_ID).getAbsolutePath() );
FileUtils.copyDirectory( sourceDir, testDir );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java Wed Nov 13 06:31:24 2013
@@ -19,11 +19,6 @@ package org.apache.archiva.consumers.cor
* under the License.
*/
-import java.io.File;
-import java.nio.charset.Charset;
-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;
@@ -32,12 +27,19 @@ import org.apache.archiva.repository.eve
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.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
+import javax.inject.Inject;
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
/**
*/
@@ -76,9 +78,9 @@ public class CleanupReleasedSnapshotsRep
archivaConfiguration =
applicationContext.getBean( "archivaConfiguration#cleanup-released-snapshots", ArchivaConfiguration.class );
- listenerControl = MockControl.createControl( RepositoryListener.class );
+ listenerControl = EasyMock.createControl( );
- listener = (RepositoryListener) listenerControl.getMock();
+ listener = listenerControl.createMock( RepositoryListener.class );
List<RepositoryListener> listeners = Collections.singletonList( listener );
repoPurge = new CleanupReleasedSnapshotsRepositoryPurge( getRepository(), metadataTools,
applicationContext.getBean(
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java Wed Nov 13 06:31:24 2013
@@ -28,6 +28,7 @@ import org.apache.archiva.common.utils.F
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.index.ArtifactContext;
@@ -36,7 +37,8 @@ import org.apache.maven.index.ArtifactSc
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.ScanningResult;
import org.apache.maven.index.context.IndexingContext;
-import org.easymock.MockControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
@@ -47,7 +49,6 @@ import org.springframework.test.context.
import javax.inject.Inject;
import java.io.File;
import java.util.List;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* @author Olivier Lamy
@@ -73,7 +74,7 @@ public abstract class AbstractMavenRepos
ArtifactContextProducer artifactContextProducer;
- MockControl archivaConfigControl;
+ IMocksControl archivaConfigControl;
Configuration config;
@@ -97,9 +98,9 @@ public abstract class AbstractMavenRepos
FileUtils.deleteDirectory( new File( FileUtil.getBasedir(), "/target/repos/" + TEST_REPO_2 + "/.indexer" ) );
assertFalse( new File( FileUtil.getBasedir(), "/target/repos/" + TEST_REPO_2 + "/.indexer" ).exists() );
- archivaConfigControl = MockControl.createControl( ArchivaConfiguration.class );
+ archivaConfigControl = EasyMock.createControl( );
- archivaConfig = (ArchivaConfiguration) archivaConfigControl.getMock();
+ archivaConfig = archivaConfigControl.createMock( ArchivaConfiguration.class );
DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin = new DefaultManagedRepositoryAdmin();
defaultManagedRepositoryAdmin.setArchivaConfiguration( archivaConfig );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchOSGITest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchOSGITest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchOSGITest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchOSGITest.java Wed Nov 13 06:31:24 2013
@@ -19,6 +19,7 @@ package org.apache.archiva.indexer.searc
* under the License.
*/
+import org.easymock.EasyMock;
import org.junit.Test;
import java.io.File;
@@ -43,7 +44,7 @@ public class MavenRepositorySearchOSGITe
List<String> selectedRepos = Arrays.asList( TEST_REPO_1 );
// search artifactId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java Wed Nov 13 06:31:24 2013
@@ -23,6 +23,7 @@ import org.apache.archiva.common.utils.F
import org.apache.archiva.indexer.util.SearchUtil;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.codehaus.plexus.util.FileUtils;
+import org.easymock.EasyMock;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@@ -104,7 +105,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = Arrays.asList( TEST_REPO_1 );
// search artifactId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -124,7 +126,8 @@ public class MavenRepositorySearchTest
archivaConfigControl.reset();
// search groupId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -147,7 +150,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = Arrays.asList( TEST_REPO_1 );
// search artifactId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -167,7 +171,8 @@ public class MavenRepositorySearchTest
archivaConfigControl.reset();
// search groupId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -191,7 +196,8 @@ public class MavenRepositorySearchTest
selectedRepos.add( TEST_REPO_1 );
// search artifactId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -221,7 +227,8 @@ public class MavenRepositorySearchTest
selectedRepos.add( TEST_REPO_1 );
// search artifactId
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -257,7 +264,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = new ArrayList<String>();
selectedRepos.add( TEST_REPO_1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
SearchResults results = search.search( "user", selectedRepos, "archiva search", null, null );
@@ -281,7 +289,8 @@ public class MavenRepositorySearchTest
SearchResultLimits limits = new SearchResultLimits( 0 );
limits.setPageSize( 1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -301,7 +310,8 @@ public class MavenRepositorySearchTest
limits = new SearchResultLimits( 1 );
limits.setPageSize( 1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -336,7 +346,8 @@ public class MavenRepositorySearchTest
config.addManagedRepository( createRepositoryConfig( TEST_REPO_2 ) );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 5 );
archivaConfigControl.replay();
@@ -371,7 +382,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = new ArrayList<String>();
selectedRepos.add( TEST_REPO_1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -390,7 +402,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = new ArrayList<String>();
selectedRepos.add( TEST_REPO_1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -408,7 +421,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = new ArrayList<String>();
selectedRepos.add( "non-existing-repo" );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -431,7 +445,8 @@ public class MavenRepositorySearchTest
List<String> previousSearchTerms = new ArrayList<String>();
previousSearchTerms.add( "archiva-test" );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -469,7 +484,8 @@ public class MavenRepositorySearchTest
searchFields.setVersion( "1.0" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -504,7 +520,8 @@ public class MavenRepositorySearchTest
SearchResultLimits limits = new SearchResultLimits( 0 );
limits.setPageSize( 1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -522,7 +539,8 @@ public class MavenRepositorySearchTest
limits = new SearchResultLimits( 1 );
limits.setPageSize( 1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -554,7 +572,8 @@ public class MavenRepositorySearchTest
searchFields.setArtifactId( "artifactid-numeric" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -597,7 +616,8 @@ public class MavenRepositorySearchTest
try
{
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -631,7 +651,8 @@ public class MavenRepositorySearchTest
try
{
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -664,7 +685,8 @@ public class MavenRepositorySearchTest
searchFields.setClassName( "org.apache.archiva.test.App" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -695,7 +717,8 @@ public class MavenRepositorySearchTest
searchFields.setPackaging( "jar" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -723,7 +746,8 @@ public class MavenRepositorySearchTest
searchFields.setPackaging( "war" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndDefaultReturn( archivaConfig.getConfiguration(), config );
+ //archivaConfigControl.expectAndDefaultReturn( archivaConfig.getConfiguration(), config );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
SearchResults results = search.search( "user", searchFields, null );
@@ -746,7 +770,8 @@ public class MavenRepositorySearchTest
searchFields.setClassName( "com.classname.search.App" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -774,7 +799,8 @@ public class MavenRepositorySearchTest
searchFields.setGroupId( "org.apache.archiva" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -798,7 +824,8 @@ public class MavenRepositorySearchTest
searchFields.setClassName( "SomeClass" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -819,7 +846,8 @@ public class MavenRepositorySearchTest
List<String> selectedRepos = Arrays.asList( TEST_REPO_1 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 0, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 0, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 0, 2 );
archivaConfigControl.replay();
@@ -847,7 +875,8 @@ public class MavenRepositorySearchTest
searchFields.setClassName( "SomeClass" );
searchFields.setRepositories( selectedRepos );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 2 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
archivaConfigControl.replay();
@@ -877,7 +906,8 @@ public class MavenRepositorySearchTest
SearchResultLimits limits = new SearchResultLimits( 0 );
limits.setPageSize( 300 );
- archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 );
+ //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 );
+ EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 5 );
archivaConfigControl.replay();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java Wed Nov 13 06:31:24 2013
@@ -42,8 +42,8 @@ import org.apache.commons.lang.ArrayUtil
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.wagon.Wagon;
-import org.easymock.ArgumentsMatcher;
-import org.easymock.MockControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
@@ -110,7 +110,7 @@ public abstract class AbstractProxyTestC
protected static final String REPOPATH_LEGACY_MANAGED_TARGET = "target/test-repository/legacy-managed";
- protected MockControl wagonMockControl;
+ protected IMocksControl wagonMockControl;
protected Wagon wagonMock;
@@ -205,8 +205,8 @@ public abstract class AbstractProxyTestC
proxyHandler = applicationContext.getBean( "repositoryProxyConnectors#test", RepositoryProxyConnectors.class );
// Setup the wagon mock.
- wagonMockControl = MockControl.createNiceControl( Wagon.class );
- wagonMock = (Wagon) wagonMockControl.getMock();
+ wagonMockControl = EasyMock.createNiceControl( );
+ wagonMock = wagonMockControl.createMock( Wagon.class );
delegate = (WagonDelegate) applicationContext.getBean( "wagon#test", Wagon.class );
@@ -236,7 +236,7 @@ public abstract class AbstractProxyTestC
}
}
-
+ /*
protected static final ArgumentsMatcher customWagonGetIfNewerMatcher = new ArgumentsMatcher()
{
@@ -288,7 +288,7 @@ public abstract class AbstractProxyTestC
return ArrayUtils.toString( arguments );
}
};
-
+ */
protected void assertChecksums( File expectedFile, String expectedSha1Contents, String expectedMd5Contents )
throws Exception
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java Wed Nov 13 06:31:24 2013
@@ -27,6 +27,7 @@ import org.apache.archiva.policies.Relea
import org.apache.archiva.policies.SnapshotsPolicy;
import org.apache.archiva.policies.urlcache.UrlFailureCache;
import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.easymock.EasyMock;
import org.junit.Test;
import java.io.File;
@@ -46,6 +47,9 @@ public class CacheFailuresTransferTest
// TODO: test some hard failures (eg TransferFailedException)
// TODO: test the various combinations of fetchFrom* (note: need only test when caching is enabled)
+ @Inject
+ UrlFailureCache urlFailureCache;
+
@Test
public void testGetWithCacheFailuresOn()
throws Exception
@@ -68,11 +72,14 @@ public class CacheFailuresTransferTest
saveConnector( ID_DEFAULT_MANAGED, "badproxied2", ChecksumPolicy.FIX, ReleasesPolicy.ALWAYS,
SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.YES, false );
- wagonMock.get( path, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
+ //wagonMock.get( path, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "resource does not exist." ), 2 );
- wagonMockControl.setMatcher( customWagonGetMatcher );
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ));
+
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "resource does not exist." ) ).times( 2 );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "resource does not exist." ), 2 );
wagonMockControl.replay();
@@ -112,10 +119,12 @@ public class CacheFailuresTransferTest
saveConnector( ID_DEFAULT_MANAGED, "badproxied2", ChecksumPolicy.FIX, ReleasesPolicy.ALWAYS,
SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.NO, false );
- wagonMock.get( path, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
+ //wagonMock.get( path, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "resource does not exist." ), 2 );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "resource does not exist." ), 2 );
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "resource does not exist." ) ).times( 2 );
wagonMockControl.replay();
@@ -125,10 +134,15 @@ public class CacheFailuresTransferTest
// Second attempt to download same artifact DOES NOT use cache
wagonMockControl.reset();
- wagonMock.get( path, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "resource does not exist." ), 2 );
+
+ //wagonMock.get( path, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "resource does not exist." ), 2 );
+
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "resource does not exist." ) ).times( 2 );
+
wagonMockControl.replay();
downloadedFile = proxyHandler.fetchFromProxies( managedDefaultRepository, artifact );
@@ -171,13 +185,9 @@ public class CacheFailuresTransferTest
assertNoTempFiles( expectedFile );
}
- @Inject
- UrlFailureCache urlFailureCache;
-
protected UrlFailureCache lookupUrlFailureCache()
throws Exception
{
- //UrlFailureCache urlFailureCache = (UrlFailureCache) lookup( "urlFailureCache" );
assertNotNull( "URL Failure Cache cannot be null.", urlFailureCache );
return urlFailureCache;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java Wed Nov 13 06:31:24 2013
@@ -26,6 +26,7 @@ import org.apache.archiva.policies.Check
import org.apache.archiva.policies.ReleasesPolicy;
import org.apache.archiva.policies.SnapshotsPolicy;
import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.easymock.EasyMock;
import org.junit.Test;
import java.io.File;
@@ -435,15 +436,25 @@ public class ChecksumTransferTest
saveConnector( ID_DEFAULT_MANAGED, "badproxied", ChecksumPolicy.IGNORE, ReleasesPolicy.ALWAYS,
SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.NO, false );
- wagonMock.get( path, new File( expectedFile.getAbsolutePath() + ".tmp" ) );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setVoidCallable();
- wagonMock.get( path + ".sha1", new File( expectedFile.getAbsolutePath() + ".sha1.tmp" ) );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setVoidCallable();
- wagonMock.get( path + ".md5", new File( expectedFile.getAbsolutePath() + ".md5.tmp" ) );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "Resource does not exist." ) );
+ //wagonMock.get( path, new File( expectedFile.getAbsolutePath() + ".tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setVoidCallable();
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().once();
+
+ //wagonMock.get( path + ".sha1", new File( expectedFile.getAbsolutePath() + ".sha1.tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setVoidCallable();
+ wagonMock.get( EasyMock.eq( path + ".sha1" ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().once();
+
+ //wagonMock.get( path + ".md5", new File( expectedFile.getAbsolutePath() + ".md5.tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "Resource does not exist." ) );
+
+ wagonMock.get( EasyMock.eq( path + ".md5" ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "Resource does not exist." ) ).once();
+
wagonMockControl.replay();
File downloadedFile = proxyHandler.fetchFromProxies( managedDefaultRepository, artifact );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java Wed Nov 13 06:31:24 2013
@@ -30,6 +30,7 @@ import org.apache.archiva.repository.lay
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.easymock.EasyMock;
import org.junit.Test;
import java.io.File;
@@ -565,17 +566,21 @@ public class ErrorHandlingTest
private void simulateGetError( String path, File expectedFile, Exception throwable )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
- wagonMock.get( path, createExpectedTempFile( expectedFile ) );
- wagonMockControl.setMatcher(customWagonGetMatcher);
- wagonMockControl.setThrowable( throwable, 1 );
+ //wagonMock.get( path, createExpectedTempFile( expectedFile ) );
+ //wagonMockControl.setMatcher(customWagonGetMatcher);
+ //wagonMockControl.setThrowable( throwable, 1 );
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().andThrow(throwable );
}
private void simulateGetIfNewerError( String path, File expectedFile, TransferFailedException exception )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
- wagonMock.getIfNewer( path, createExpectedTempFile( expectedFile ), expectedFile.lastModified() );
- wagonMockControl.setMatcher(customWagonGetIfNewerMatcher);
- wagonMockControl.setThrowable( exception, 1 );
+ //wagonMock.getIfNewer( path, createExpectedTempFile( expectedFile ), expectedFile.lastModified() );
+ //wagonMockControl.setMatcher(customWagonGetIfNewerMatcher);
+ //wagonMockControl.setThrowable( exception, 1 );
+ wagonMock.getIfNewer( EasyMock.eq( path ), EasyMock.anyObject( File.class ), EasyMock.eq( expectedFile.lastModified() ));
+ EasyMock.expectLastCall().andThrow( exception );
}
private File createExpectedTempFile( File expectedFile )
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java Wed Nov 13 06:31:24 2013
@@ -27,6 +27,7 @@ import org.apache.archiva.policies.Snaps
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.easymock.EasyMock;
import org.junit.Test;
import java.io.File;
@@ -398,9 +399,12 @@ public class ManagedDefaultTransferTest
// Configure Repository (usually done within archiva.xml configuration)
saveRemoteRepositoryConfig( "badproxied", "Bad Proxied", "test://bad.machine.com/repo/", "default" );
- wagonMock.get( path, new File( expectedFile.getAbsolutePath() + ".tmp" ) );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "transfer failed" ) );
+ //wagonMock.get( path, new File( expectedFile.getAbsolutePath() + ".tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "transfer failed" ) );
+
+ wagonMock.get( EasyMock.eq( path), EasyMock.anyObject( File.class ) );
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "transfer failed" ) );
wagonMockControl.replay();
// Configure Connector (usually done within archiva.xml configuration)
@@ -438,15 +442,18 @@ public class ManagedDefaultTransferTest
saveConnector( ID_DEFAULT_MANAGED, "badproxied2", false );
File tmpFile = new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" );
- wagonMock.get( path, tmpFile );
-
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "Can't find resource." ) );
-
- wagonMock.get( path, tmpFile );
- wagonMockControl.setMatcher( customWagonGetMatcher );
- wagonMockControl.setThrowable( new ResourceDoesNotExistException( "Can't find resource." ) );
+ //wagonMock.get( path, tmpFile );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "Can't find resource." ) );
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ) );
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "Can't find resource." ) );
+
+ //wagonMock.get( path, tmpFile );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new ResourceDoesNotExistException( "Can't find resource." ) );
+ wagonMock.get( EasyMock.eq( path ), EasyMock.anyObject( File.class ) );
+ EasyMock.expectLastCall().andThrow( new ResourceDoesNotExistException( "Can't find resource." ) );
wagonMockControl.replay();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java Wed Nov 13 06:31:24 2013
@@ -35,9 +35,11 @@ import org.apache.archiva.repository.met
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.custommonkey.xmlunit.DetailedDiff;
import org.custommonkey.xmlunit.Diff;
+import org.easymock.EasyMock;
import org.junit.Test;
import javax.inject.Inject;
@@ -154,11 +156,13 @@ public class MetadataTransferTest
// ensure that a hard failure in the first proxy connector is skipped and the second repository checked
File expectedFile = new File( managedDefaultDir.getAbsoluteFile(),
metadataTools.getRepositorySpecificName( "badproxied1", requestedResource ) );
- wagonMock.get( requestedResource, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
- wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMock.get( requestedResource, new File( expectedFile.getParentFile(), expectedFile.getName() + ".tmp" ) );
+ //wagonMockControl.setMatcher( customWagonGetMatcher );
+ //wagonMockControl.setThrowable( new TransferFailedException( "can't connect" ) );
+ wagonMock.get( EasyMock.eq( requestedResource ), EasyMock.anyObject( File.class ));
+ EasyMock.expectLastCall().andThrow( new TransferFailedException( "can't connect" ) );
- wagonMockControl.setThrowable( new TransferFailedException( "can't connect" ) );
wagonMockControl.replay();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java Wed Nov 13 06:31:24 2013
@@ -28,7 +28,8 @@ import org.apache.archiva.configuration.
import org.apache.archiva.redback.components.registry.Registry;
import org.apache.archiva.redback.components.registry.RegistryException;
import org.apache.archiva.redback.components.registry.RegistryListener;
-import org.easymock.MockControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.springframework.stereotype.Service;
import java.util.Collections;
@@ -53,14 +54,14 @@ public class MockConfiguration
private Set<ConfigurationListener> configListeners = new HashSet<ConfigurationListener>();
- private MockControl registryControl;
+ private IMocksControl registryControl;
private Registry registryMock;
public MockConfiguration()
{
- registryControl = MockControl.createNiceControl( org.apache.archiva.redback.components.registry.Registry.class );
- registryMock = (org.apache.archiva.redback.components.registry.Registry) registryControl.getMock();
+ registryControl = EasyMock.createNiceControl( );
+ registryMock = registryControl.createMock( Registry.class );
}
@PostConstruct
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java Wed Nov 13 06:31:24 2013
@@ -26,7 +26,7 @@ import org.apache.archiva.configuration.
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.commons.lang.SystemUtils;
-import org.easymock.MockControl;
+import org.easymock.IMocksControl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.BeansException;
@@ -53,6 +53,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import static org.easymock.EasyMock.*;
/**
* RepositoryContentConsumersTest
@@ -243,24 +244,32 @@ public class RepositoryContentConsumersT
public void testExecution( )
throws Exception
{
- MockControl knownControl = MockControl.createNiceControl( KnownRepositoryContentConsumer.class );
+ IMocksControl knownControl = createNiceControl( );
+
RepositoryContentConsumers consumers = lookupRepositoryConsumers( );
- KnownRepositoryContentConsumer selectedKnownConsumer = (KnownRepositoryContentConsumer) knownControl.getMock( );
- KnownRepositoryContentConsumer unselectedKnownConsumer =
- (KnownRepositoryContentConsumer) MockControl.createNiceControl(
- KnownRepositoryContentConsumer.class ).getMock( );
+ KnownRepositoryContentConsumer selectedKnownConsumer = knownControl.createMock( KnownRepositoryContentConsumer.class );
+
+ //KnownRepositoryContentConsumer unselectedKnownConsumer =
+ // (KnownRepositoryContentConsumer) MockControl.createNiceControl(
+ // KnownRepositoryContentConsumer.class ).getMock( );
+
+ KnownRepositoryContentConsumer unselectedKnownConsumer = createNiceControl().createMock( KnownRepositoryContentConsumer.class );
+
consumers.setApplicationContext(
new MockApplicationContext( Arrays.asList( selectedKnownConsumer, unselectedKnownConsumer ), null ) );
consumers.setSelectedKnownConsumers( Collections.singletonList( selectedKnownConsumer ) );
- MockControl invalidControl = MockControl.createControl( InvalidRepositoryContentConsumer.class );
- InvalidRepositoryContentConsumer selectedInvalidConsumer =
- (InvalidRepositoryContentConsumer) invalidControl.getMock( );
- InvalidRepositoryContentConsumer unselectedInvalidConsumer =
- (InvalidRepositoryContentConsumer) MockControl.createControl(
- InvalidRepositoryContentConsumer.class ).getMock( );
+ IMocksControl invalidControl = createControl();
+
+ InvalidRepositoryContentConsumer selectedInvalidConsumer = invalidControl.createMock( InvalidRepositoryContentConsumer.class );
+
+ //InvalidRepositoryContentConsumer unselectedInvalidConsumer =
+ // (InvalidRepositoryContentConsumer) MockControl.createControl(
+ // InvalidRepositoryContentConsumer.class ).getMock( );
+
+ InvalidRepositoryContentConsumer unselectedInvalidConsumer = createControl().createMock( InvalidRepositoryContentConsumer.class );
consumers.setApplicationContext(
new MockApplicationContext( null, Arrays.asList( selectedInvalidConsumer, unselectedInvalidConsumer ) ) );
@@ -274,11 +283,9 @@ public class RepositoryContentConsumersT
startTime.setTime( 12345678 );
selectedKnownConsumer.beginScan( repo, startTime, false );
- selectedKnownConsumer.getExcludes( );
- knownControl.setReturnValue( Collections.EMPTY_LIST );
- selectedKnownConsumer.getIncludes( );
- knownControl.setReturnValue( Collections.singletonList( "**/*.txt" ) );
+ expect( selectedKnownConsumer.getIncludes( ) ).andReturn( Collections.singletonList( "**/*.txt" ) );
selectedKnownConsumer.processFile( _OS( "path/to/test-file.txt" ), false );
+
// knownConsumer.completeScan();
knownControl.replay( );
@@ -286,28 +293,34 @@ public class RepositoryContentConsumersT
// invalidConsumer.completeScan();
invalidControl.replay( );
+
consumers.executeConsumers( repo, testFile, true );
knownControl.verify( );
invalidControl.verify( );
+ //verify( in );
knownControl.reset( );
invalidControl.reset( );
+
File notIncludedTestFile = new File( "target/test-repo/path/to/test-file.xml" );
selectedKnownConsumer.beginScan( repo, startTime, false );
- selectedKnownConsumer.getExcludes( );
- knownControl.setReturnValue( Collections.EMPTY_LIST );
- selectedKnownConsumer.getIncludes( );
- knownControl.setReturnValue( Collections.singletonList( "**/*.txt" ) );
+ //selectedKnownConsumer.getExcludes( );
+ //knownControl.setReturnValue( Collections.EMPTY_LIST );
+ expect( selectedKnownConsumer.getExcludes() ).andReturn( Collections.<String>emptyList() );
+
+ //selectedKnownConsumer.getIncludes( );
+ //knownControl.setReturnValue( Collections.singletonList( "**/*.txt" ) );
+ expect( selectedKnownConsumer.getIncludes( ) ).andReturn( Collections.singletonList( "**/*.txt" ) );
+
// knownConsumer.completeScan();
knownControl.replay( );
selectedInvalidConsumer.beginScan( repo, startTime, false );
selectedInvalidConsumer.processFile( _OS( "path/to/test-file.xml" ), false );
- selectedInvalidConsumer.getId( );
- invalidControl.setReturnValue( "invalid" );
+ expect( selectedInvalidConsumer.getId() ).andReturn( "invalid" );
// invalidConsumer.completeScan();
invalidControl.replay( );
@@ -322,15 +335,13 @@ public class RepositoryContentConsumersT
File excludedTestFile = new File( "target/test-repo/path/to/test-file.txt" );
selectedKnownConsumer.beginScan( repo, startTime, false );
- selectedKnownConsumer.getExcludes( );
- knownControl.setReturnValue( Collections.singletonList( "**/test-file.txt" ) );
+ expect( selectedKnownConsumer.getExcludes() ).andReturn( Collections.singletonList( "**/test-file.txt" ) );
// knownConsumer.completeScan();
knownControl.replay( );
selectedInvalidConsumer.beginScan( repo, startTime, false );
selectedInvalidConsumer.processFile( _OS( "path/to/test-file.txt" ), false );
- selectedInvalidConsumer.getId( );
- invalidControl.setReturnValue( "invalid" );
+ expect( selectedInvalidConsumer.getId() ).andReturn( "invalid" );
// invalidConsumer.completeScan();
invalidControl.replay( );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java Wed Nov 13 06:31:24 2013
@@ -25,7 +25,8 @@ import junit.framework.TestCase;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.rss.RssFeedGenerator;
-import org.easymock.MockControl;
+import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
+import org.easymock.IMocksControl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,9 +37,11 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
-@RunWith( ArchivaBlockJUnit4ClassRunner.class )
+import static org.easymock.EasyMock.createControl;
+import static org.easymock.EasyMock.expect;
+
+@RunWith(ArchivaBlockJUnit4ClassRunner.class)
public class NewVersionsOfArtifactRssFeedProcessorTest
extends TestCase
{
@@ -50,7 +53,7 @@ public class NewVersionsOfArtifactRssFee
private static final String ARTIFACT_ID = "artifact-two";
- private MockControl metadataRepositoryControl;
+ private IMocksControl metadataRepositoryControl;
private MetadataRepository metadataRepository;
@@ -63,11 +66,11 @@ public class NewVersionsOfArtifactRssFee
newVersionsProcessor = new NewVersionsOfArtifactRssFeedProcessor();
newVersionsProcessor.setGenerator( new RssFeedGenerator() );
- metadataRepositoryControl = MockControl.createControl( MetadataRepository.class );
- metadataRepository = (MetadataRepository) metadataRepositoryControl.getMock();
+ metadataRepositoryControl = createControl();
+ metadataRepository = metadataRepositoryControl.createMock( MetadataRepository.class );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testProcess()
throws Exception
@@ -85,20 +88,29 @@ public class NewVersionsOfArtifactRssFee
reqParams.put( RssFeedProcessor.KEY_GROUP_ID, GROUP_ID );
reqParams.put( RssFeedProcessor.KEY_ARTIFACT_ID, ARTIFACT_ID );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(), Collections.singletonList(
- TEST_REPO ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getProjectVersions( TEST_REPO, GROUP_ID,
- ARTIFACT_ID ), Arrays.asList(
- "1.0.1", "1.0.2", "1.0.3-SNAPSHOT" ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID,
- "1.0.1" ),
- Collections.singletonList( artifact1 ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID,
- "1.0.2" ),
- Collections.singletonList( artifact2 ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID,
- "1.0.3-SNAPSHOT" ),
- Collections.singletonList( artifact3 ) );
+ //metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(), Collections.singletonList(
+ // TEST_REPO ) );
+ expect( metadataRepository.getRepositories() ).andReturn( Collections.singletonList( TEST_REPO ) );
+ //metadataRepositoryControl.expectAndReturn( metadataRepository.getProjectVersions( TEST_REPO, GROUP_ID,
+ // ARTIFACT_ID ), Arrays.asList(
+ // "1.0.1", "1.0.2", "1.0.3-SNAPSHOT" ) );
+ expect( metadataRepository.getProjectVersions( TEST_REPO, GROUP_ID, ARTIFACT_ID ) ).andReturn(
+ Arrays.asList( "1.0.1", "1.0.2", "1.0.3-SNAPSHOT" ) );
+ //metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID,
+ // "1.0.1" ),
+ // Collections.singletonList( artifact1 ) );
+ expect( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.1" ) ).andReturn(
+ Collections.singletonList( artifact1 ) );
+ //metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID,
+ // "1.0.2" ),
+ // Collections.singletonList( artifact2 ) );
+ expect( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.2" ) ).andReturn(
+ Collections.singletonList( artifact2 ) );
+ //metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID,
+ // "1.0.3-SNAPSHOT" ),
+ // Collections.singletonList( artifact3 ) );
+ expect( metadataRepository.getArtifacts( TEST_REPO, GROUP_ID, ARTIFACT_ID, "1.0.3-SNAPSHOT" ) ).andReturn(
+ Collections.singletonList( artifact3 ) );
metadataRepositoryControl.replay();
SyndFeed feed = newVersionsProcessor.process( reqParams, metadataRepository );
@@ -113,8 +125,8 @@ public class NewVersionsOfArtifactRssFee
assertEquals( 2, entries.size() );
- assertEquals( "New Versions of Artifact 'org.apache.archiva:artifact-two' as of " + whenGathered, entries.get(
- 0 ).getTitle() );
+ assertEquals( "New Versions of Artifact 'org.apache.archiva:artifact-two' as of " + whenGathered,
+ entries.get( 0 ).getTitle() );
assertEquals( whenGathered, entries.get( 0 ).getPublishedDate() );
assertEquals( "New Versions of Artifact 'org.apache.archiva:artifact-two' as of " + whenGatheredNext,
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java?rev=1541399&r1=1541398&r2=1541399&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java Wed Nov 13 06:31:24 2013
@@ -19,15 +19,16 @@ package org.apache.archiva.security;
* under the License.
*/
-import org.apache.archiva.redback.users.User;
-import org.apache.archiva.redback.users.UserManager;
-import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.UnauthorizedException;
import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.apache.archiva.redback.system.SecuritySession;
-import org.easymock.MockControl;
+import org.apache.archiva.redback.users.User;
+import org.apache.archiva.redback.users.UserManager;
+import org.apache.archiva.security.common.ArchivaRoleConstants;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class ArchivaServletAuthenticator
@Named( value = "servletAuthenticator#test" )
private ServletAuthenticator servletAuth;
- private MockControl httpServletRequestControl;
+ private IMocksControl httpServletRequestControl;
private HttpServletRequest request;
@@ -55,8 +56,8 @@ public class ArchivaServletAuthenticator
{
super.setUp();
- httpServletRequestControl = MockControl.createControl( HttpServletRequest.class );
- request = (HttpServletRequest) httpServletRequestControl.getMock();
+ httpServletRequestControl = EasyMock.createControl( );
+ request = httpServletRequestControl.createMock( HttpServletRequest.class );
setupRepository( "corporate" );
}
@@ -123,7 +124,8 @@ public class ArchivaServletAuthenticator
assignRepositoryObserverRole( USER_ALPACA, "corporate" );
- httpServletRequestControl.expectAndReturn( request.getRemoteAddr(), "192.168.111.111" );
+ //httpServletRequestControl.expectAndReturn( request.getRemoteAddr(), "192.168.111.111" );
+ EasyMock.expect( request.getRemoteAddr() ).andReturn( "192.168.111.111" );
UserManager userManager = securitySystem.getUserManager();
User user = userManager.findUser( USER_ALPACA );