Re: svn commit: r679221 - /maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java

Wed, 23 Jul 2008 17:53:18 -0700 

John,
I've reverted this change. It removed code that was actually part of the test case (setting the update manager in a known state to test certain branches of the wagon manager's use of it). Even in the ones that have no other assertions, the verify() method was ensuring the update checks were correct. 

The merge of the cast change is unnecessary.

- Brett

On 24/07/2008, at 8:58 AM, [EMAIL PROTECTED] wrote:


Author: jdcasey
Date: Wed Jul 23 15:58:21 2008
New Revision: 679221

URL: http://svn.apache.org/viewvc?rev=679221&view=rev
Log:
Fixing errors introduced through merge.

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=679221&r1=679220&r2=679221&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 15:58:21 2008

@@ -104,15 +104,6 @@

        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 );
@@ -125,8 +116,6 @@
        }

        assertFalse( artifact.getFile().exists() );
-
-        control.verify();
    }


    public void testGetMissingPomCached() throws  
TransferFailedException, UnsupportedProtocolException, IOException

@@ -135,14 +124,6 @@

        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 );
@@ -155,8 +136,6 @@
        }

        assertFalse( artifact.getFile().exists() );
-
-        control.verify();
    }


    public void testGetMissingPomCachedForced() throws  
TransferFailedException, UnsupportedProtocolException, IOException

@@ -165,13 +144,6 @@

        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 );
@@ -184,8 +156,6 @@
        }

        assertFalse( artifact.getFile().exists() );
-
-        control.verify();
    }

    public void testGetRemotePom()
@@ -199,20 +169,10 @@

        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()
@@ -226,18 +186,10 @@

        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

@@ -291,18 +243,10 @@

        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()
@@ -316,18 +260,10 @@

        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()
@@ -341,23 +277,10 @@

        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()
@@ -371,21 +294,10 @@

        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( "", FileUtils.fileRead( artifact.getFile() ) );
-
-        control.verify();

+        assertEquals( "expected",  
FileUtils.fileRead( artifact.getFile() ) );

    }

    public void testGetSnapshotJarExistsLocallyExpired()
@@ -399,23 +311,10 @@

        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()
@@ -429,20 +328,10 @@

        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 )




--
Brett Porter
[EMAIL PROTECTED]
http://blogs.exist.com/bporter/


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]























					Reply via email to