Tweaked test fixture
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/212c1e02 Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/212c1e02 Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/212c1e02 Branch: refs/heads/ant-tasks Commit: 212c1e02a3e88d6b30d95725100b6b3b101e7285 Parents: 9d039ef Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Thu Jan 2 22:30:05 2014 +0100 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Thu Jan 2 22:30:05 2014 +0100 ---------------------------------------------------------------------- src/test/java/org/eclipse/aether/ant/AntBuildsTest.java | 4 ++++ src/test/java/org/eclipse/aether/ant/DeployTest.java | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/212c1e02/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java b/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java index 3dca901..d7916a9 100644 --- a/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java +++ b/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java @@ -37,6 +37,8 @@ public abstract class AntBuildsTest protected File localRepoDir; + protected File distRepoDir; + protected String getProjectDirName() { String name = getClass().getSimpleName(); @@ -63,10 +65,12 @@ public abstract class AntBuildsTest projectDir = new File( new File( BASE_DIR, "src/test/resources/ant" ), getProjectDirName() ); localRepoDir = new File( BUILD_DIR, "local-repo" ); + distRepoDir = new File( BUILD_DIR, "dist-repo" ); System.setProperty( "project.dir", projectDir.getAbsolutePath() ); System.setProperty( "build.dir", BUILD_DIR.getAbsolutePath() ); System.setProperty( "maven.repo.local", localRepoDir.getAbsolutePath() ); + System.setProperty( "project.distrepo.url", distRepoDir.toURI().toString() ); setUpProperties(); configureProject( new File( projectDir, "ant.xml" ).getAbsolutePath(), Project.MSG_VERBOSE ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/212c1e02/src/test/java/org/eclipse/aether/ant/DeployTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/DeployTest.java b/src/test/java/org/eclipse/aether/ant/DeployTest.java index 2107bf9..ad68651 100644 --- a/src/test/java/org/eclipse/aether/ant/DeployTest.java +++ b/src/test/java/org/eclipse/aether/ant/DeployTest.java @@ -24,15 +24,6 @@ public class DeployTest extends AntBuildsTest { - private File distRepoDir; - - @Override - protected void setUpProperties() - { - distRepoDir = new File( BUILD_DIR, "dist-repo" ); - System.setProperty( "project.distrepo.url", distRepoDir.toURI().toString() ); - } - public void testDeployGlobalPom() { executeTarget( "testDeployGlobalPom" );
