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

[MNG-5696] Remove dependency on Easymock 

This closes #25
This commit is contained in:
Robert Scholte 2014-09-29 20:50:22 +02:00
parent b80fb7d7ce
commit e31c84cb4e
4 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-compat/pom.xml
View File

@ -87,11 +87,6 @@
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

58
maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
View File

@ -1,58 +0,0 @@
package org.apache.maven.artifact.testutils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.easymock.MockControl;
public class MockManager
{
private List mockControls = new ArrayList();
public void add( MockControl control )
{
mockControls.add( control );
}
public void replayAll()
{
for ( Object mockControl : mockControls )
{
MockControl control = (MockControl) mockControl;
control.replay();
}
}
public void verifyAll()
{
for ( Object mockControl : mockControls )
{
MockControl control = (MockControl) mockControl;
control.verify();
}
}
}

6
maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
View File

@ -45,7 +45,6 @@ import org.apache.maven.wagon.observers.AbstractTransferListener;
import org.apache.maven.wagon.observers.Debug;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.easymock.MockControl;
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
@ -162,15 +161,10 @@ public class DefaultWagonManagerTest
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
MockControl control = MockControl.createControl( UpdateCheckManager.class );
control.replay();
wagonManager.getArtifact( artifact, repo, null, false );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
control.verify();
}
private Artifact createTestPomArtifact( String directory )

9
pom.xml
View File

@ -46,7 +46,6 @@
<maven.compiler.target>1.6</maven.compiler.target>
<classWorldsVersion>2.5.2</classWorldsVersion>
<commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
<plexusInterpolationVersion>1.19</plexusInterpolationVersion>
@ -347,14 +346,6 @@
<artifactId>plexus-cipher</artifactId>
<version>${cipherVersion}</version>
</dependency>
<!--bootstrap-start-comment-->
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easyMockVersion}</version>
<scope>test</scope>
</dependency>
<!--bootstrap-end-comment-->
</dependencies>
<!--bootstrap-start-comment-->
</dependencyManagement>