Repository: maven Updated Branches: refs/heads/master b80fb7d7c -> e31c84cb4
[MNG-5696] Remove dependency on Easymock This closes #25 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e31c84cb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e31c84cb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e31c84cb Branch: refs/heads/master Commit: e31c84cb4ef9143dbc79e6321f2cae57e5ff3072 Parents: b80fb7d Author: Robert Scholte <[email protected]> Authored: Mon Sep 29 20:50:22 2014 +0200 Committer: Robert Scholte <[email protected]> Committed: Mon Sep 29 20:50:22 2014 +0200 ---------------------------------------------------------------------- maven-compat/pom.xml | 5 -- .../maven/artifact/testutils/MockManager.java | 58 -------------------- .../legacy/DefaultWagonManagerTest.java | 6 -- pom.xml | 9 --- 4 files changed, 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/e31c84cb/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index b2e0638..5aa1cae 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/maven/blob/e31c84cb/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java deleted file mode 100644 index 4b6f637..0000000 --- a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java +++ /dev/null @@ -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(); - } - } - -} http://git-wip-us.apache.org/repos/asf/maven/blob/e31c84cb/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java index bcda50a..068c0e0 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java @@ -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="[email protected]">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 ) http://git-wip-us.apache.org/repos/asf/maven/blob/e31c84cb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7d9df1a..270358a 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
