You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/07/24 02:49:02 UTC
svn commit: r679250 -
/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Author: brett
Date: Wed Jul 23 17:49:01 2008
New Revision: 679250
URL: http://svn.apache.org/viewvc?rev=679250&view=rev
Log:
revert r679221, the mock constructs form a part of the test cases and removing them changes the behaviour
Modified:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=679250&r1=679249&r2=679250&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Wed Jul 23 17:49:01 2008
@@ -56,7 +56,7 @@
public class DefaultWagonManagerTest
extends PlexusTestCase
{
- private WagonManager wagonManager;
+ private DefaultWagonManager wagonManager;
private TransferListener transferListener = new Debug();
@@ -67,7 +67,7 @@
{
super.setUp();
- wagonManager = (WagonManager) lookup( WagonManager.ROLE );
+ wagonManager = (DefaultWagonManager) lookup( WagonManager.ROLE );
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
}
@@ -104,6 +104,15 @@
ArtifactRepository repo = createStringRepo();
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.isPomUpdateRequired( artifact, repo );
+ control.setReturnValue( true );
+ updateCheckManager.touch( artifact, repo );
+ control.replay();
+
try
{
wagonManager.getArtifact( artifact, repo, false );
@@ -116,6 +125,8 @@
}
assertFalse( artifact.getFile().exists() );
+
+ control.verify();
}
public void testGetMissingPomCached() throws TransferFailedException, UnsupportedProtocolException, IOException
@@ -124,6 +135,14 @@
ArtifactRepository repo = createStringRepo();
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.isPomUpdateRequired( artifact, repo );
+ control.setReturnValue( false );
+ control.replay();
+
try
{
wagonManager.getArtifact( artifact, repo, false );
@@ -136,6 +155,8 @@
}
assertFalse( artifact.getFile().exists() );
+
+ control.verify();
}
public void testGetMissingPomCachedForced() throws TransferFailedException, UnsupportedProtocolException, IOException
@@ -144,6 +165,13 @@
ArtifactRepository repo = createStringRepo();
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.touch( artifact, repo );
+ control.replay();
+
try
{
wagonManager.getArtifact( artifact, repo, true );
@@ -156,6 +184,8 @@
}
assertFalse( artifact.getFile().exists() );
+
+ control.verify();
}
public void testGetRemotePom()
@@ -169,10 +199,20 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.isPomUpdateRequired( artifact, repo );
+ control.setReturnValue( true );
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetPomExistsLocallyForced()
@@ -186,10 +226,18 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, true );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetMissingJar() throws TransferFailedException, UnsupportedProtocolException, IOException
@@ -243,10 +291,18 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetJarExistsLocallyForced()
@@ -260,10 +316,18 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, true );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetRemoteSnapshotJar()
@@ -277,10 +341,23 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.isUpdateRequired( artifact, repo );
+ control.setReturnValue( true );
+
+ updateCheckManager.touch( artifact, repo );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetSnapshotJarExistsLocally()
@@ -294,10 +371,21 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.isUpdateRequired( artifact, repo );
+ control.setReturnValue( false );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+ assertEquals( "", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetSnapshotJarExistsLocallyExpired()
@@ -311,10 +399,23 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.isUpdateRequired( artifact, repo );
+ control.setReturnValue( true );
+
+ updateCheckManager.touch( artifact, repo );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, false );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
public void testGetSnapshotJarExistsLocallyForced()
@@ -328,10 +429,20 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
+ MockControl control = MockControl.createControl( UpdateCheckManager.class );
+ UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
+ wagonManager.setUpdateCheckManager( updateCheckManager );
+
+ updateCheckManager.touch( artifact, repo );
+
+ control.replay();
+
wagonManager.getArtifact( artifact, repo, true );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile() ) );
+
+ control.verify();
}
private Artifact createTestPomArtifact( String directory )