You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2017/05/25 13:48:53 UTC
[07/50] [abbrv] ant-ivy git commit: setup proper loggers in unit
tests and factorize the creation and the cleaning of the cache folder
setup proper loggers in unit tests and factorize the creation and the cleaning of the cache folder
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/2d7c6f5f
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/2d7c6f5f
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/2d7c6f5f
Branch: refs/heads/xooki2asciidoc
Commit: 2d7c6f5ff4c2986d3b3af987a371dc89285ba788
Parents: bb3ddfe
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Sep 6 20:01:25 2015 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Sep 6 20:01:25 2015 +0200
----------------------------------------------------------------------
test/java/org/apache/ivy/IvyTest.java | 4 +-
test/java/org/apache/ivy/MainTest.java | 4 +-
test/java/org/apache/ivy/TestHelper.java | 30 +++++++++-
.../apache/ivy/ant/AntBuildResolverTest.java | 38 +++---------
.../org/apache/ivy/ant/AntBuildTriggerTest.java | 4 +-
.../org/apache/ivy/ant/AntCallTriggerTest.java | 4 +-
test/java/org/apache/ivy/ant/AntTestHelper.java | 34 -----------
.../org/apache/ivy/ant/BuildOBRTaskTest.java | 31 ++--------
.../org/apache/ivy/ant/FixDepsTaskTest.java | 28 +++------
.../apache/ivy/ant/IvyArtifactPropertyTest.java | 27 +++------
.../apache/ivy/ant/IvyArtifactReportTest.java | 27 +++------
.../org/apache/ivy/ant/IvyBuildListTest.java | 7 ++-
.../org/apache/ivy/ant/IvyBuildNumberTest.java | 29 +++-------
.../org/apache/ivy/ant/IvyCacheFilesetTest.java | 25 ++------
.../org/apache/ivy/ant/IvyCachePathTest.java | 30 +++-------
.../org/apache/ivy/ant/IvyCleanCacheTest.java | 7 ++-
.../org/apache/ivy/ant/IvyConfigureTest.java | 11 ++--
.../org/apache/ivy/ant/IvyConvertPomTest.java | 6 +-
.../java/org/apache/ivy/ant/IvyDeliverTest.java | 28 +++------
.../apache/ivy/ant/IvyDependencyTreeTest.java | 21 ++-----
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 21 ++-----
.../org/apache/ivy/ant/IvyFindRevisionTest.java | 25 ++------
.../apache/ivy/ant/IvyInfoRepositoryTest.java | 25 ++------
test/java/org/apache/ivy/ant/IvyInfoTest.java | 7 ++-
.../java/org/apache/ivy/ant/IvyInstallTest.java | 7 ++-
.../org/apache/ivy/ant/IvyListModulesTest.java | 25 ++------
.../apache/ivy/ant/IvyPostResolveTaskTest.java | 9 +--
.../java/org/apache/ivy/ant/IvyPublishTest.java | 7 ++-
test/java/org/apache/ivy/ant/IvyReportTest.java | 61 ++++++++------------
.../apache/ivy/ant/IvyRepositoryReportTest.java | 39 +++++--------
.../java/org/apache/ivy/ant/IvyResolveTest.java | 30 +++-------
.../org/apache/ivy/ant/IvyResourcesTest.java | 33 ++---------
.../org/apache/ivy/ant/IvyRetrieveTest.java | 12 ++--
test/java/org/apache/ivy/ant/IvyTaskTest.java | 11 ++--
test/java/org/apache/ivy/ant/IvyVarTest.java | 14 ++---
.../ivy/ant/testutil/AntTaskTestCase.java | 8 +--
.../org/apache/ivy/core/TestPerformance.java | 19 +-----
.../DefaultRepositoryCacheManagerTest.java | 4 +-
.../cache/ModuleDescriptorMemoryCacheTest.java | 6 +-
.../apache/ivy/core/deliver/DeliverTest.java | 7 ++-
.../ivy/core/event/IvyEventFilterTest.java | 4 +-
.../apache/ivy/core/install/InstallTest.java | 23 ++------
.../ivy/core/module/id/ModuleRulesTest.java | 4 +-
.../ivy/core/publish/PublishEngineTest.java | 4 +-
.../ivy/core/publish/PublishEventsTest.java | 4 +-
.../ivy/core/report/ResolveReportTest.java | 4 +-
.../RepositoryManagementEngineTest.java | 4 +-
.../ivy/core/resolve/ResolveEngineTest.java | 4 +-
.../apache/ivy/core/resolve/ResolveTest.java | 4 +-
.../apache/ivy/core/retrieve/RetrieveTest.java | 26 +++------
.../org/apache/ivy/core/search/SearchTest.java | 4 +-
.../apache/ivy/core/settings/ConfigureTest.java | 4 +-
.../ivy/core/settings/IvySettingsTest.java | 4 +-
.../settings/OnlineXmlSettingsParserTest.java | 4 +-
.../core/settings/XmlSettingsParserTest.java | 4 +-
.../java/org/apache/ivy/core/sort/SortTest.java | 6 +-
.../osgi/core/AggregatedOSGiResolverTest.java | 4 +-
.../ivy/osgi/core/ManifestParserTest.java | 4 +-
.../ivy/osgi/core/OsgiLatestStrategyTest.java | 4 +-
.../apache/ivy/osgi/filter/OSGiFilterTest.java | 4 +-
.../org/apache/ivy/osgi/obr/OBRParserTest.java | 4 +-
.../apache/ivy/osgi/obr/OBRResolverTest.java | 6 +-
.../apache/ivy/osgi/obr/OBRXMLWriterTest.java | 4 +-
.../apache/ivy/osgi/p2/P2DescriptorTest.java | 4 +-
.../apache/ivy/osgi/repo/BundleRepoTest.java | 4 +-
.../UpdateSiteAndIbiblioResolverTest.java | 4 +-
.../osgi/updatesite/UpdateSiteLoaderTest.java | 4 +-
.../osgi/updatesite/UpdateSiteResolverTest.java | 4 +-
.../IgnoreCircularDependencyStrategyTest.java | 4 +-
.../WarnCircularDependencyStrategyTest.java | 4 +-
.../LatestCompatibleConflictManagerTest.java | 4 +-
.../conflict/LatestConflictManagerTest.java | 4 +-
.../conflict/RegexpConflictManagerTest.java | 4 +-
.../conflict/StrictConflictManagerTest.java | 4 +-
.../plugins/lock/ArtifactLockStrategyTest.java | 4 +-
.../namespace/MRIDTransformationRuleTest.java | 4 +-
.../plugins/namespace/NameSpaceHelperTest.java | 4 +-
.../AbstractModuleDescriptorParserTester.java | 4 +-
.../ModuleDescriptorParserRegistryTest.java | 4 +-
.../m2/PomModuleDescriptorParserTest.java | 5 --
.../m2/PomModuleDescriptorWriterTest.java | 4 +-
.../parser/xml/XmlModuleUpdaterTest.java | 4 +-
.../ivy/plugins/report/XmlReportParserTest.java | 34 ++++-------
.../ivy/plugins/report/XmlReportWriterTest.java | 4 +-
.../repository/vfs/VfsRepositoryTest.java | 4 +-
.../plugins/repository/vfs/VfsResourceTest.java | 4 +-
.../AbstractDependencyResolverTest.java | 4 +-
.../plugins/resolver/BintrayResolverTest.java | 16 +----
.../ivy/plugins/resolver/ChainResolverTest.java | 17 ++----
.../plugins/resolver/IBiblioResolverTest.java | 16 ++---
.../plugins/resolver/IvyRepResolverTest.java | 15 ++---
.../ivy/plugins/resolver/JarResolverTest.java | 4 +-
.../ivy/plugins/resolver/Maven2LocalTest.java | 4 +-
.../resolver/MirroredURLResolverTest.java | 21 ++-----
.../plugins/resolver/ResolverTestHelper.java | 4 +-
.../ivy/plugins/resolver/URLResolverTest.java | 15 ++---
.../resolver/util/ResolverHelperTest.java | 4 +-
.../ivy/plugins/trigger/LogTriggerTest.java | 4 +-
.../version/PatternVersionMatcherTest.java | 4 +-
.../version/VersionRangeMatcherTest.java | 4 +-
.../apache/ivy/util/IvyPatternHelperTest.java | 4 +-
.../ivy/util/url/AbstractURLHandlerTest.java | 4 +-
.../ivy/util/url/BasicURLHandlerTest.java | 4 +-
.../ivy/util/url/HttpclientURLHandlerTest.java | 4 +-
104 files changed, 400 insertions(+), 773 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/IvyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/IvyTest.java b/test/java/org/apache/ivy/IvyTest.java
index 3147e0a..5a525e6 100644
--- a/test/java/org/apache/ivy/IvyTest.java
+++ b/test/java/org/apache/ivy/IvyTest.java
@@ -19,8 +19,6 @@ package org.apache.ivy;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.core.resolve.ResolveOptions;
@@ -28,6 +26,8 @@ import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.util.CacheCleaner;
import org.apache.ivy.util.MockMessageLogger;
+import junit.framework.TestCase;
+
public class IvyTest extends TestCase {
private File cache;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/MainTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/MainTest.java b/test/java/org/apache/ivy/MainTest.java
index a6fa94b..eeb026e 100644
--- a/test/java/org/apache/ivy/MainTest.java
+++ b/test/java/org/apache/ivy/MainTest.java
@@ -19,12 +19,12 @@ package org.apache.ivy;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.util.CacheCleaner;
import org.apache.ivy.util.cli.CommandLine;
import org.apache.ivy.util.cli.ParseException;
+import junit.framework.TestCase;
+
public class MainTest extends TestCase {
private File cache;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/TestHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java
index 017edf4..a68f4c0 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -27,8 +27,6 @@ import java.util.LinkedHashSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -46,6 +44,11 @@ import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.plugins.resolver.FileSystemResolver;
import org.apache.ivy.util.FileUtil;
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.Assert;
public class TestHelper {
@@ -326,4 +329,27 @@ public class TestHelper {
public static ResolveOptions newResolveOptions(IvySettings settings) {
return new ResolveOptions();
}
+
+ public static Project newProject() {
+ Project project = new Project();
+ DefaultLogger logger = new DefaultLogger();
+ logger.setMessageOutputLevel(Project.MSG_INFO);
+ logger.setOutputPrintStream(System.out);
+ logger.setErrorPrintStream(System.out);
+ project.addBuildListener(logger);
+ return project;
+ }
+
+ public static File cache = new File("build/cache");
+
+ public static void createCache() {
+ cache.mkdirs();
+ }
+
+ public static void cleanCache() {
+ Delete del = new Delete();
+ del.setProject(new Project());
+ del.setDir(cache);
+ del.execute();
+ }
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntBuildResolverTest.java b/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
index 23f8756..95dd017 100644
--- a/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
+++ b/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
@@ -19,18 +19,17 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.ant.AntWorkspaceResolver.WorkspaceArtifact;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.DownloadStatus;
import org.apache.ivy.core.report.ResolveReport;
-import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import junit.framework.TestCase;
+
public class AntBuildResolverTest extends TestCase {
private static final ModuleRevisionId MRID_MODULE1 = ModuleRevisionId.newInstance("org.acme",
@@ -39,8 +38,6 @@ public class AntBuildResolverTest extends TestCase {
private static final ModuleRevisionId MRID_PROJECT1 = ModuleRevisionId.newInstance(
"org.apache.ivy.test", "project1", "0.1");
- private File cache;
-
private Project project;
private IvyConfigure configure;
@@ -49,14 +46,9 @@ public class AntBuildResolverTest extends TestCase {
@Override
protected void setUp() throws Exception {
- createCache();
- project = new Project();
- DefaultLogger logger = new DefaultLogger();
- logger.setMessageOutputLevel(Project.MSG_INFO);
- logger.setOutputPrintStream(System.out);
- logger.setErrorPrintStream(System.err);
- project.addBuildListener(logger);
- project.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+ TestHelper.cleanCache();
+ project = TestHelper.newProject();
+ project.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
AntWorkspaceResolver antWorkspaceResolver = new AntWorkspaceResolver();
antWorkspaceResolver.setName("test-workspace");
@@ -75,21 +67,9 @@ public class AntBuildResolverTest extends TestCase {
configure.execute();
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
@Override
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testNoProject() throws Exception {
@@ -185,7 +165,7 @@ public class AntBuildResolverTest extends TestCase {
assertEquals(
new File("test/workspace/project1/target/dist/jars/project1.jar").getAbsolutePath(),
path.list()[0]);
- assertEquals(new File(cache, "org.acme/module1/jars/module1-1.1.jar").getAbsolutePath(),
+ assertEquals(new File(TestHelper.cache, "org.acme/module1/jars/module1-1.1.jar").getAbsolutePath(),
path.list()[1]);
}
@@ -207,7 +187,7 @@ public class AntBuildResolverTest extends TestCase {
assertEquals(2, path.size());
assertEquals(new File("test/workspace/project1/target/classes").getAbsolutePath(),
path.list()[0]);
- assertEquals(new File(cache, "org.acme/module1/jars/module1-1.1.jar").getAbsolutePath(),
+ assertEquals(new File(TestHelper.cache, "org.acme/module1/jars/module1-1.1.jar").getAbsolutePath(),
path.list()[1]);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java b/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
index 50a9fcb..ac53b9e 100644
--- a/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
+++ b/test/java/org/apache/ivy/ant/AntBuildTriggerTest.java
@@ -19,12 +19,12 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class AntBuildTriggerTest extends TestCase {
public void test() throws Exception {
assertFalse(new File("test/triggers/ant-build/A/A.jar").exists());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
index b8e4987..02a504a 100644
--- a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
+++ b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
@@ -22,8 +22,6 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.util.Vector;
-import junit.framework.TestCase;
-
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildLogger;
@@ -36,6 +34,8 @@ import org.apache.tools.ant.ProjectHelper;
import org.apache.tools.ant.input.DefaultInputHandler;
import org.apache.tools.ant.input.InputHandler;
+import junit.framework.TestCase;
+
public class AntCallTriggerTest extends TestCase {
public void test() throws Exception {
assertFalse(new File("test/triggers/ant-call/A/out/foo.txt").exists());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/AntTestHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntTestHelper.java b/test/java/org/apache/ivy/ant/AntTestHelper.java
deleted file mode 100644
index 38cbe0d..0000000
--- a/test/java/org/apache/ivy/ant/AntTestHelper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.ant;
-
-import org.apache.tools.ant.DefaultLogger;
-import org.apache.tools.ant.Project;
-
-public class AntTestHelper {
- // this is probably already available in some Ant class or helper...
- public static Project newProject() {
- Project project = new Project();
- DefaultLogger logger = new DefaultLogger();
- logger.setMessageOutputLevel(Project.MSG_INFO);
- logger.setOutputPrintStream(System.out);
- logger.setErrorPrintStream(System.out);
- project.addBuildListener(logger);
- return project;
- }
-}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java b/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java
index e8e4259..f9f1b79 100644
--- a/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java
+++ b/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java
@@ -23,16 +23,15 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.text.ParseException;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.osgi.obr.xml.OBRXMLParser;
import org.apache.ivy.osgi.repo.BundleRepoDescriptor;
import org.apache.ivy.util.CollectionUtils;
-import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
public class BuildOBRTaskTest extends TestCase {
private File cache;
@@ -43,12 +42,7 @@ public class BuildOBRTaskTest extends TestCase {
protected void setUp() throws Exception {
createCache();
- project = new Project();
- DefaultLogger logger = new DefaultLogger();
- logger.setMessageOutputLevel(Project.MSG_INFO);
- logger.setOutputPrintStream(System.out);
- logger.setErrorPrintStream(System.err);
- project.addBuildListener(logger);
+ project = TestHelper.newProject();
buildObr = new BuildOBRTask();
buildObr.setProject(project);
@@ -61,14 +55,7 @@ public class BuildOBRTaskTest extends TestCase {
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
private BundleRepoDescriptor readObr(File obrFile) throws FileNotFoundException,
@@ -106,13 +93,7 @@ public class BuildOBRTaskTest extends TestCase {
}
public void testResolve() throws Exception {
- Project otherProject = new Project();
- DefaultLogger logger = new DefaultLogger();
- logger.setOutputPrintStream(System.out);
- logger.setErrorPrintStream(System.err);
- logger.setMessageOutputLevel(Project.MSG_INFO);
- otherProject.addBuildListener(logger);
-
+ Project otherProject = TestHelper.newProject();
otherProject.setProperty("ivy.settings.file", "test/test-repo/bundlerepo/ivysettings.xml");
IvyResolve resolve = new IvyResolve();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/FixDepsTaskTest.java b/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
index 94775f3..5825cc0 100644
--- a/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
+++ b/test/java/org/apache/ivy/ant/FixDepsTaskTest.java
@@ -22,46 +22,32 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
-public class FixDepsTaskTest extends TestCase {
+import junit.framework.TestCase;
- private File cache;
+public class FixDepsTaskTest extends TestCase {
private FixDepsTask fixDeps;
private Project project;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
fixDeps = new FixDepsTask();
fixDeps.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java b/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
index 72cf5a7..3aed282 100644
--- a/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
+++ b/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
@@ -19,43 +19,30 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.TestCase;
public class IvyArtifactPropertyTest extends TestCase {
- private File cache;
private IvyArtifactProperty prop;
private Project project;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
prop = new IvyArtifactProperty();
prop.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java b/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
index 5cc4cb9..4938e79 100644
--- a/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
+++ b/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
@@ -19,42 +19,29 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.TestCase;
public class IvyArtifactReportTest extends TestCase {
- private File cache;
private IvyArtifactReport prop;
private Project project;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
prop = new IvyArtifactReport();
prop.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyBuildListTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyBuildListTest.java b/test/java/org/apache/ivy/ant/IvyBuildListTest.java
index b688e77..23409cc 100644
--- a/test/java/org/apache/ivy/ant/IvyBuildListTest.java
+++ b/test/java/org/apache/ivy/ant/IvyBuildListTest.java
@@ -22,13 +22,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import junit.framework.TestCase;
+
// CheckStyle:MagicNumber| OFF
// The test very often use MagicNumber. Using a constant is less expressive.
@@ -43,7 +44,7 @@ public class IvyBuildListTest extends TestCase {
protected void setUp() throws Exception {
createCache();
- project = new Project();
+ project = TestHelper.newProject();
project.init();
buildlist = new IvyBuildList();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
index a8c935c..565ecbc 100644
--- a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
+++ b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
@@ -17,41 +17,26 @@
*/
package org.apache.ivy.ant;
-import java.io.File;
+import org.apache.ivy.TestHelper;
+import org.apache.tools.ant.Project;
import junit.framework.TestCase;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
-
public class IvyBuildNumberTest extends TestCase {
- private File cache;
private IvyBuildNumber buildNumber;
protected void setUp() throws Exception {
- createCache();
- Project project = new Project();
+ TestHelper.createCache();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
buildNumber = new IvyBuildNumber();
buildNumber.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testDefault() throws Exception {
@@ -162,7 +147,7 @@ public class IvyBuildNumberTest extends TestCase {
}
public void testWithBadChecksum() throws Exception {
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings-checksums.xml");
buildNumber = new IvyBuildNumber();
@@ -179,7 +164,7 @@ public class IvyBuildNumberTest extends TestCase {
public void testChainResolver() throws Exception {
// IVY-1037
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/IVY-1037/ivysettings.xml");
buildNumber = new IvyBuildNumber();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
index 38019e2..2fd533b 100644
--- a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
@@ -19,8 +19,6 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestHelper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -28,37 +26,26 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.types.FileSet;
+import junit.framework.TestCase;
+
public class IvyCacheFilesetTest extends TestCase {
- private File cache;
private IvyCacheFileset fileset;
private Project project;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
fileset = new IvyCacheFileset();
fileset.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyCachePathTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCachePathTest.java b/test/java/org/apache/ivy/ant/IvyCachePathTest.java
index a692d77..092c6b2 100644
--- a/test/java/org/apache/ivy/ant/IvyCachePathTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCachePathTest.java
@@ -19,45 +19,31 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestHelper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.types.Path;
+import junit.framework.TestCase;
+
public class IvyCachePathTest extends TestCase {
- private File cache;
private IvyCachePath path;
private Project project;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
path = new IvyCachePath();
path.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
@@ -184,7 +170,7 @@ public class IvyCachePathTest extends TestCase {
}
public void testWithResolveIdWithoutResolve() throws Exception {
- Project otherProject = new Project();
+ Project otherProject = TestHelper.newProject();
otherProject.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
IvyResolve resolve = new IvyResolve();
@@ -214,7 +200,7 @@ public class IvyCachePathTest extends TestCase {
}
public void testWithResolveIdAndMissingConfs() throws Exception {
- Project otherProject = new Project();
+ Project otherProject = TestHelper.newProject();
otherProject.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
IvyResolve resolve = new IvyResolve();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java b/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
index 48800fd..cf2dc8f 100644
--- a/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
@@ -19,11 +19,12 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class IvyCleanCacheTest extends TestCase {
private IvyCleanCache cleanCache;
@@ -36,7 +37,7 @@ public class IvyCleanCacheTest extends TestCase {
private File resolutionCache;
protected void setUp() throws Exception {
- Project p = new Project();
+ Project p = TestHelper.newProject();
cacheDir = new File("build/cache");
p.setProperty("cache", cacheDir.getAbsolutePath());
cleanCache = new IvyCleanCache();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyConfigureTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyConfigureTest.java b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
index ea9ad9b..cea5d86 100644
--- a/test/java/org/apache/ivy/ant/IvyConfigureTest.java
+++ b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
@@ -19,9 +19,8 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.plugins.resolver.IBiblioResolver;
@@ -30,13 +29,15 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Reference;
+import junit.framework.TestCase;
+
public class IvyConfigureTest extends TestCase {
private IvyConfigure configure;
private Project project;
protected void setUp() throws Exception {
- project = new Project();
+ project = TestHelper.newProject();
project.setProperty("myproperty", "myvalue");
configure = new IvyConfigure();
@@ -67,7 +68,7 @@ public class IvyConfigureTest extends TestCase {
project.getProperty("ivy.cache.dir.test"));
// test with a File
- project = new Project();
+ project = TestHelper.newProject();
configure = new IvyConfigure();
configure.setProject(project);
configure.setFile(new File("test/java/org/apache/ivy/ant/ivysettings-defaultCacheDir.xml"));
@@ -78,7 +79,7 @@ public class IvyConfigureTest extends TestCase {
project.getProperty("ivy.cache.dir.test2"));
// test if no defaultCacheDir is specified
- project = new Project();
+ project = TestHelper.newProject();
configure = new IvyConfigure();
configure.setProject(project);
configure
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyConvertPomTest.java b/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
index 4592db3..1d6ca35 100644
--- a/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
+++ b/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
@@ -19,14 +19,14 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
+import org.apache.ivy.TestHelper;
-import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
public class IvyConvertPomTest extends TestCase {
public void testSimple() throws Exception {
IvyConvertPom task = new IvyConvertPom();
- task.setProject(new Project());
+ task.setProject(TestHelper.newProject());
task.setPomFile(new File("test/java/org/apache/ivy/ant/test.pom"));
File destFile = File.createTempFile("ivy", ".xml");
destFile.deleteOnExit();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyDeliverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDeliverTest.java b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
index 2d2c8de..d29c1c7 100644
--- a/test/java/org/apache/ivy/ant/IvyDeliverTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
@@ -28,8 +28,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -39,8 +38,9 @@ import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
+import junit.framework.TestCase;
+
public class IvyDeliverTest extends TestCase {
- private File cache;
private IvyDeliver deliver;
@@ -50,36 +50,24 @@ public class IvyDeliverTest extends TestCase {
cleanTestDir();
cleanRetrieveDir();
cleanRep();
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.init();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("build", "build/test/deliver");
deliver = new IvyDeliver();
deliver.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
+ TestHelper.cleanCache();
cleanTestDir();
cleanRetrieveDir();
cleanRep();
}
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
- }
-
private void cleanTestDir() {
Delete del = new Delete();
del.setProject(new Project());
@@ -244,7 +232,7 @@ public class IvyDeliverTest extends TestCase {
public void testWithResolveIdInAnotherBuild() throws Exception {
// create a new build
- Project other = new Project();
+ Project other = TestHelper.newProject();
other.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
other.setProperty("build", "build/test/deliver");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
index d0d9704..0e85b2b 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
@@ -19,42 +19,29 @@ package org.apache.ivy.ant;
import java.io.File;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.ant.testutil.AntTaskTestCase;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
public class IvyDependencyTreeTest extends AntTaskTestCase {
- private File cache;
private IvyDependencyTree dependencyTree;
private Project project;
protected void setUp() throws Exception {
- createCache();
+ TestHelper.createCache();
project = configureProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
dependencyTree = new IvyDependencyTree();
dependencyTree.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
index 86f3303..65b4523 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
@@ -20,40 +20,27 @@ package org.apache.ivy.ant;
import java.io.File;
import org.apache.ivy.Ivy;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.ant.testutil.AntTaskTestCase;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
- private File cache;
private IvyDependencyUpdateChecker dependencyUpdateChecker;
protected void setUp() throws Exception {
- createCache();
+ TestHelper.createCache();
Project project = configureProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- project.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+ project.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
dependencyUpdateChecker = new IvyDependencyUpdateChecker();
dependencyUpdateChecker.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java b/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
index 9b6d7cc..ca1c19c 100644
--- a/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
+++ b/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
@@ -17,41 +17,26 @@
*/
package org.apache.ivy.ant;
-import java.io.File;
+import org.apache.ivy.TestHelper;
+import org.apache.tools.ant.Project;
import junit.framework.TestCase;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
-
public class IvyFindRevisionTest extends TestCase {
- private File cache;
private IvyFindRevision findRevision;
protected void setUp() throws Exception {
- createCache();
- Project project = new Project();
+ TestHelper.createCache();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
findRevision = new IvyFindRevision();
findRevision.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testProperty() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java b/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
index 16d4ce6..cc25c95 100644
--- a/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
@@ -17,41 +17,26 @@
*/
package org.apache.ivy.ant;
-import java.io.File;
+import org.apache.ivy.TestHelper;
+import org.apache.tools.ant.Project;
import junit.framework.TestCase;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
-
public class IvyInfoRepositoryTest extends TestCase {
- private File cache;
private IvyInfo info;
protected void setUp() throws Exception {
- createCache();
- Project project = new Project();
+ TestHelper.createCache();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
info = new IvyInfo();
info.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testProperty() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyInfoTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyInfoTest.java b/test/java/org/apache/ivy/ant/IvyInfoTest.java
index 2f1b581..967a881 100644
--- a/test/java/org/apache/ivy/ant/IvyInfoTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInfoTest.java
@@ -19,15 +19,16 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class IvyInfoTest extends TestCase {
private IvyInfo info;
protected void setUp() throws Exception {
- Project project = new Project();
+ Project project = TestHelper.newProject();
info = new IvyInfo();
info.setProject(project);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyInstallTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyInstallTest.java b/test/java/org/apache/ivy/ant/IvyInstallTest.java
index 1ea326f..c1b65eb 100644
--- a/test/java/org/apache/ivy/ant/IvyInstallTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInstallTest.java
@@ -19,12 +19,13 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class IvyInstallTest extends TestCase {
private File cache;
@@ -36,7 +37,7 @@ public class IvyInstallTest extends TestCase {
createCache();
cleanInstall();
- project = AntTestHelper.newProject();
+ project = TestHelper.newProject();
install = new IvyInstall();
install.setProject(project);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyListModulesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyListModulesTest.java b/test/java/org/apache/ivy/ant/IvyListModulesTest.java
index 511ed06..9fd62e9 100644
--- a/test/java/org/apache/ivy/ant/IvyListModulesTest.java
+++ b/test/java/org/apache/ivy/ant/IvyListModulesTest.java
@@ -17,41 +17,26 @@
*/
package org.apache.ivy.ant;
-import java.io.File;
+import org.apache.ivy.TestHelper;
+import org.apache.tools.ant.Project;
import junit.framework.TestCase;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
-
public class IvyListModulesTest extends TestCase {
- private File cache;
private IvyListModules findModules;
protected void setUp() throws Exception {
- createCache();
- Project project = new Project();
+ TestHelper.createCache();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
findModules = new IvyListModules();
findModules.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testExact() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java b/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
index 31bdfaa..54cfc04 100644
--- a/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
+++ b/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
@@ -19,16 +19,14 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.util.CacheCleaner;
-import org.apache.ivy.util.DefaultMessageLogger;
-import org.apache.ivy.util.Message;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class IvyPostResolveTaskTest extends TestCase {
private File cache;
@@ -37,9 +35,8 @@ public class IvyPostResolveTaskTest extends TestCase {
private Project project;
protected void setUp() throws Exception {
- Message.setDefaultLogger(new DefaultMessageLogger(10));
createCache();
- project = new Project();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
task = new IvyPostResolveTask() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyPublishTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyPublishTest.java b/test/java/org/apache/ivy/ant/IvyPublishTest.java
index af2c094..2020824 100644
--- a/test/java/org/apache/ivy/ant/IvyPublishTest.java
+++ b/test/java/org/apache/ivy/ant/IvyPublishTest.java
@@ -24,8 +24,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.text.ParseException;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
@@ -37,6 +36,8 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.Echo;
+import junit.framework.TestCase;
+
public class IvyPublishTest extends TestCase {
private File cache;
@@ -48,7 +49,7 @@ public class IvyPublishTest extends TestCase {
cleanTestDir();
cleanRep();
createCache();
- project = new Project();
+ project = TestHelper.newProject();
project.init();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("build", "build/test/publish");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyReportTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyReportTest.java b/test/java/org/apache/ivy/ant/IvyReportTest.java
index 491854f..445b82c 100644
--- a/test/java/org/apache/ivy/ant/IvyReportTest.java
+++ b/test/java/org/apache/ivy/ant/IvyReportTest.java
@@ -20,44 +20,31 @@ package org.apache.ivy.ant;
import java.io.File;
import java.util.Locale;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.TestCase;
public class IvyReportTest extends TestCase {
- private File cache;
private IvyReport report;
private Project project;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
report = new IvyReport();
report.setTaskName("report");
report.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
@@ -72,12 +59,12 @@ public class IvyReportTest extends TestCase {
res.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
res.execute();
- report.setTodir(new File(cache, "report"));
+ report.setTodir(new File(TestHelper.cache, "report"));
report.execute();
- assertTrue(new File(cache, "report/apache-resolve-simple-default.html").exists());
- assertTrue(new File(cache, "report/ivy-report.css").exists()); // IVY-826
- assertTrue(new File(cache, "report/apache-resolve-simple-default.graphml").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-default.html").exists());
+ assertTrue(new File(TestHelper.cache, "report/ivy-report.css").exists()); // IVY-826
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-default.graphml").exists());
} finally {
Locale.setDefault(oldLocale);
}
@@ -95,11 +82,11 @@ public class IvyReportTest extends TestCase {
res.setFile(new File("test/repositories/1/org6/mod6.2/ivys/ivy-0.7.xml"));
res.execute();
- report.setTodir(new File(cache, "report"));
+ report.setTodir(new File(TestHelper.cache, "report"));
report.setXml(true);
report.execute();
- File xmlReport = new File(cache, "report/org6-mod6.2-default.xml");
+ File xmlReport = new File(TestHelper.cache, "report/org6-mod6.2-default.xml");
assertTrue(xmlReport.exists());
// check that revision 2.2 of mod1.2 is only present once
String reportContent = FileUtil.readEntirely(xmlReport);
@@ -148,13 +135,13 @@ public class IvyReportTest extends TestCase {
res.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
res.execute();
- report.setTodir(new File(cache, "report"));
+ report.setTodir(new File(TestHelper.cache, "report"));
report.setOutputpattern("[organisation]-[module]-[revision].[ext]");
report.setConf("default");
report.execute();
- assertTrue(new File(cache, "report/apache-resolve-simple-1.0.html").exists());
- assertTrue(new File(cache, "report/apache-resolve-simple-1.0.graphml").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-1.0.html").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-1.0.graphml").exists());
} finally {
Locale.setDefault(oldLocale);
}
@@ -172,13 +159,13 @@ public class IvyReportTest extends TestCase {
res.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
res.execute();
- report.setTodir(new File(cache, "report"));
+ report.setTodir(new File(TestHelper.cache, "report"));
report.execute();
- assertTrue(new File(cache, "report/apache-resolve-simple-default.html").exists());
- assertTrue(new File(cache, "report/apache-resolve-simple-default.graphml").exists());
- assertTrue(new File(cache, "report/apache-resolve-simple-compile.html").exists());
- assertTrue(new File(cache, "report/apache-resolve-simple-compile.graphml").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-default.html").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-default.graphml").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-compile.html").exists());
+ assertTrue(new File(TestHelper.cache, "report/apache-resolve-simple-compile.graphml").exists());
} finally {
Locale.setDefault(oldLocale);
}
@@ -196,13 +183,13 @@ public class IvyReportTest extends TestCase {
res.setProject(project);
res.execute();
- report.setTodir(new File(cache, "report"));
+ report.setTodir(new File(TestHelper.cache, "report"));
report.setXml(true);
report.execute();
- assertTrue(new File(cache, "report/org11-mod11.1-compile.xml").exists());
- assertTrue(new File(cache, "report/org11-mod11.1-compile.html").exists());
+ assertTrue(new File(TestHelper.cache, "report/org11-mod11.1-compile.xml").exists());
+ assertTrue(new File(TestHelper.cache, "report/org11-mod11.1-compile.html").exists());
} finally {
Locale.setDefault(oldLocale);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java b/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
index 556ba85..a8999d1 100644
--- a/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
+++ b/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
@@ -21,50 +21,37 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.TestCase;
public class IvyRepositoryReportTest extends TestCase {
- private File cache;
private IvyRepositoryReport report;
protected void setUp() throws Exception {
- createCache();
- Project project = new Project();
+ TestHelper.createCache();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings-1.xml");
report = new IvyRepositoryReport();
report.setProject(project);
- System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ System.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSimple() throws Exception {
report.setOrganisation("org1");
report.setOutputname("testsimple");
- report.setTodir(cache);
+ report.setTodir(TestHelper.cache);
report.execute();
- File reportFile = new File(cache, "testsimple.xml");
+ File reportFile = new File(TestHelper.cache, "testsimple.xml");
assertTrue(reportFile.exists());
String g = FileUtil.readEntirely(new BufferedReader(new FileReader(reportFile)));
@@ -81,10 +68,10 @@ public class IvyRepositoryReportTest extends TestCase {
report.getProject().setProperty("ivy.settings.file",
"test/repositories/IVY-716/ivysettings.xml");
report.setOutputname("testbranch");
- report.setTodir(cache);
+ report.setTodir(TestHelper.cache);
report.execute();
- File reportFile = new File(cache, "testbranch.xml");
+ File reportFile = new File(TestHelper.cache, "testbranch.xml");
assertTrue(reportFile.exists());
String g = FileUtil.readEntirely(new BufferedReader(new FileReader(reportFile)));
@@ -100,10 +87,10 @@ public class IvyRepositoryReportTest extends TestCase {
report.getProject().setProperty("ivy.settings.file",
"test/repositories/IVY-729/ivysettings.xml");
report.setOutputname("test-no-org");
- report.setTodir(cache);
+ report.setTodir(TestHelper.cache);
report.execute();
- File reportFile = new File(cache, "test-no-org.xml");
+ File reportFile = new File(TestHelper.cache, "test-no-org.xml");
assertTrue(reportFile.exists());
String g = FileUtil.readEntirely(new BufferedReader(new FileReader(reportFile)));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyResolveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyResolveTest.java b/test/java/org/apache/ivy/ant/IvyResolveTest.java
index e2211d0..c619949 100644
--- a/test/java/org/apache/ivy/ant/IvyResolveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResolveTest.java
@@ -19,48 +19,34 @@ package org.apache.ivy.ant;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.Parallel;
+import junit.framework.TestCase;
+
public class IvyResolveTest extends TestCase {
- private File cache;
private Project project;
private IvyResolve resolve;
protected void setUp() throws Exception {
- createCache();
- project = new Project();
+ TestHelper.createCache();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- project.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+ project.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
resolve = new IvyResolve();
resolve.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testIVY1455() throws Exception {
@@ -86,14 +72,14 @@ public class IvyResolveTest extends TestCase {
}
public void testIVY779() throws Exception {
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.local.default.root",
new File("test/repositories/norev").getAbsolutePath());
project.setProperty("ivy.local.default.ivy.pattern", "[module]/[artifact].[ext]");
project.setProperty("ivy.local.default.artifact.pattern", "[module]/[artifact].[ext]");
resolve.setProject(project);
- project.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+ project.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
resolve.setFile(new File("test/repositories/norev/ivy.xml"));
resolve.setKeep(true);
resolve.execute();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyResourcesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyResourcesTest.java b/test/java/org/apache/ivy/ant/IvyResourcesTest.java
index a572893..afc3590 100644
--- a/test/java/org/apache/ivy/ant/IvyResourcesTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResourcesTest.java
@@ -22,51 +22,30 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.TestHelper;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.types.resources.FileResource;
-public class IvyResourcesTest extends TestCase {
+import junit.framework.TestCase;
- private File cache;
+public class IvyResourcesTest extends TestCase {
private IvyResources resources;
protected void setUp() throws Exception {
- createCache();
- Project project = new Project();
- DefaultLogger logger = new DefaultLogger();
- logger.setOutputPrintStream(System.out);
- logger.setErrorPrintStream(System.err);
- logger.setMessageOutputLevel(Project.MSG_INFO);
- project.addBuildListener(logger);
+ TestHelper.createCache();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- project.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+ project.setProperty("ivy.cache.dir", TestHelper.cache.getAbsolutePath());
resources = new IvyResources();
resources.setProject(project);
}
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
- }
-
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
private File getArchiveFileInCache(String organisation, String module, String revision,
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyRetrieveTest.java b/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
index 26b3296..2a913ff 100644
--- a/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
@@ -20,14 +20,14 @@ package org.apache.ivy.ant;
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.util.CacheCleaner;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class IvyRetrieveTest extends TestCase {
private static final String IVY_RETRIEVE_PATTERN = "build/test/lib/[organisation]/[module]/ivy-[revision].xml";
@@ -42,7 +42,7 @@ public class IvyRetrieveTest extends TestCase {
protected void setUp() throws Exception {
createCache();
CacheCleaner.deleteDir(new File("build/test/lib"));
- project = new Project();
+ project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
retrieve = new IvyRetrieve();
@@ -166,7 +166,7 @@ public class IvyRetrieveTest extends TestCase {
public void testWithAPreviousResolve() throws Exception {
// first we do a resolve in another project
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve resolve = new IvyResolve();
@@ -185,7 +185,7 @@ public class IvyRetrieveTest extends TestCase {
public void testWithAPreviousResolveAndResolveId() throws Exception {
// first we do a resolve in another project
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve resolve = new IvyResolve();
@@ -207,7 +207,7 @@ public class IvyRetrieveTest extends TestCase {
public void testUseOrigin() throws Exception {
// test case for IVY-304
// first we do a resolve with useOrigin=true in another project
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.init();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyTaskTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyTaskTest.java b/test/java/org/apache/ivy/ant/IvyTaskTest.java
index 0fbd2d5..53c5238 100644
--- a/test/java/org/apache/ivy/ant/IvyTaskTest.java
+++ b/test/java/org/apache/ivy/ant/IvyTaskTest.java
@@ -20,18 +20,19 @@ package org.apache.ivy.ant;
import java.io.File;
import java.net.MalformedURLException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Reference;
+import junit.framework.TestCase;
+
public class IvyTaskTest extends TestCase {
public void testDefaultSettings() throws MalformedURLException {
- Project p = new Project();
+ Project p = TestHelper.newProject();
p.setBasedir("test/repositories");
p.setProperty("myproperty", "myvalue");
IvyTask task = new IvyTask() {
@@ -60,7 +61,7 @@ public class IvyTaskTest extends TestCase {
}
public void testReferencedSettings() throws MalformedURLException {
- Project p = new Project();
+ Project p = TestHelper.newProject();
p.setProperty("myproperty", "myvalue");
IvyAntSettings antSettings = new IvyAntSettings();
@@ -92,7 +93,7 @@ public class IvyTaskTest extends TestCase {
}
public void testIvyVersionAsAntProperty() {
- Project p = new Project();
+ Project p = TestHelper.newProject();
p.setBasedir("test/repositories");
IvyTask task = new IvyTask() {
public void doExecute() throws BuildException {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/IvyVarTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyVarTest.java b/test/java/org/apache/ivy/ant/IvyVarTest.java
index e365bdf..05a2f2d 100644
--- a/test/java/org/apache/ivy/ant/IvyVarTest.java
+++ b/test/java/org/apache/ivy/ant/IvyVarTest.java
@@ -17,15 +17,15 @@
*/
package org.apache.ivy.ant;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
-import org.apache.tools.ant.Project;
+import org.apache.ivy.TestHelper;
+
+import junit.framework.TestCase;
public class IvyVarTest extends TestCase {
public void testSimple() {
IvyVar task = new IvyVar();
- task.setProject(new Project());
+ task.setProject(TestHelper.newProject());
task.setName("mytest");
task.setValue("myvalue");
task.execute();
@@ -36,7 +36,7 @@ public class IvyVarTest extends TestCase {
public void testPrefix() {
IvyVar task = new IvyVar();
- task.setProject(new Project());
+ task.setProject(TestHelper.newProject());
task.setName("mytest");
task.setValue("myvalue");
task.setPrefix("myprefix");
@@ -48,7 +48,7 @@ public class IvyVarTest extends TestCase {
public void testURL() {
IvyVar task = new IvyVar();
- task.setProject(new Project());
+ task.setProject(TestHelper.newProject());
task.setUrl(IvyVarTest.class.getResource("vartest.properties").toExternalForm());
task.execute();
Ivy ivy = task.getIvyInstance();
@@ -59,7 +59,7 @@ public class IvyVarTest extends TestCase {
public void testURLPrefix() {
IvyVar task = new IvyVar();
- task.setProject(new Project());
+ task.setProject(TestHelper.newProject());
task.setUrl(IvyVarTest.class.getResource("vartest.properties").toExternalForm());
task.setPrefix("myprefix.");
task.execute();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/ant/testutil/AntTaskTestCase.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/testutil/AntTaskTestCase.java b/test/java/org/apache/ivy/ant/testutil/AntTaskTestCase.java
index 975acb9..ecc568a 100644
--- a/test/java/org/apache/ivy/ant/testutil/AntTaskTestCase.java
+++ b/test/java/org/apache/ivy/ant/testutil/AntTaskTestCase.java
@@ -17,17 +17,17 @@
*/
package org.apache.ivy.ant.testutil;
-import junit.framework.TestCase;
-
-import org.apache.ivy.ant.AntTestHelper;
+import org.apache.ivy.TestHelper;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class AntTaskTestCase extends TestCase {
private AntTestListener antTestListener;
public Project configureProject() {
- Project project = AntTestHelper.newProject();
+ Project project = TestHelper.newProject();
antTestListener = new AntTestListener(Project.MSG_INFO);
project.addBuildListener(antTestListener);
return project;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/TestPerformance.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/TestPerformance.java b/test/java/org/apache/ivy/core/TestPerformance.java
index 5580dce..c380380 100644
--- a/test/java/org/apache/ivy/core/TestPerformance.java
+++ b/test/java/org/apache/ivy/core/TestPerformance.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.Random;
import org.apache.ivy.Ivy;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -42,8 +43,6 @@ public class TestPerformance {
private final Ivy ivy;
- private File cache;
-
public TestPerformance() throws Exception {
ivy = new Ivy();
FileSystemResolver resolver = new FileSystemResolver();
@@ -58,23 +57,11 @@ public class TestPerformance {
}
protected void setUp() throws Exception {
- createCache();
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ TestHelper.createCache();
}
protected void tearDown() throws Exception {
- cleanCache();
- }
-
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
private void cleanRepo() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
index 61ac601..9753315 100644
--- a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
+++ b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
@@ -24,8 +24,6 @@ import java.io.PrintWriter;
import java.text.ParseException;
import java.util.Date;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -48,6 +46,8 @@ import org.apache.ivy.util.Message;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
+import junit.framework.TestCase;
+
/**
* @see DefaultResolutionCacheManager
*/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
index c13c083..0558a14 100644
--- a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
+++ b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
@@ -21,15 +21,15 @@ import java.io.File;
import java.io.IOException;
import java.text.ParseException;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.parser.ParserSettings;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
public class ModuleDescriptorMemoryCacheTest extends TestCase {
ModuleDescriptorMemoryCache cache = new ModuleDescriptorMemoryCache(2);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/deliver/DeliverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/deliver/DeliverTest.java b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
index 022fd5d..fa6b240 100644
--- a/test/java/org/apache/ivy/core/deliver/DeliverTest.java
+++ b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
@@ -23,13 +23,14 @@ import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.ant.IvyDeliver;
import org.apache.ivy.ant.IvyResolve;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
+import junit.framework.TestCase;
+
public class DeliverTest extends TestCase {
private File cache;
@@ -45,7 +46,7 @@ public class DeliverTest extends TestCase {
deliverDir = new File("build/test/deliver");
deliverDir.mkdirs();
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.init();
ivyDeliver = new IvyDeliver();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java b/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
index 70760b0..2dcbac2 100644
--- a/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
+++ b/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
@@ -19,8 +19,6 @@ package org.apache.ivy.core.event;
import java.util.Date;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.event.resolve.EndResolveEvent;
import org.apache.ivy.core.event.resolve.StartResolveEvent;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
@@ -28,6 +26,8 @@ import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.ResolveReport;
+import junit.framework.TestCase;
+
public class IvyEventFilterTest extends TestCase {
private ModuleDescriptor md = null;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/install/InstallTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/install/InstallTest.java b/test/java/org/apache/ivy/core/install/InstallTest.java
index 1f27fba..c57188a 100644
--- a/test/java/org/apache/ivy/core/install/InstallTest.java
+++ b/test/java/org/apache/ivy/core/install/InstallTest.java
@@ -19,15 +19,16 @@ package org.apache.ivy.core.install;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.plugins.matcher.PatternMatcher;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
+import junit.framework.TestCase;
+
public class InstallTest extends TestCase {
public void testSimple() throws Exception {
@@ -184,29 +185,15 @@ public class InstallTest extends TestCase {
assertTrue(new File("build/test/install/org1/mod1.4/ivy-1.0.1.xml").exists());
}
- private File _cache;
-
protected void setUp() throws Exception {
- createCache();
- }
-
- private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ TestHelper.createCache();
}
protected void tearDown() throws Exception {
- cleanCache();
+ TestHelper.cleanCache();
cleanInstall();
}
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(_cache);
- del.execute();
- }
-
private void cleanInstall() {
Delete del = new Delete();
del.setProject(new Project());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
index d20d26b..8d92f9f 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
@@ -20,8 +20,6 @@ package org.apache.ivy.core.module.id;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
import org.apache.ivy.plugins.matcher.MapMatcher;
@@ -29,6 +27,8 @@ import org.apache.ivy.plugins.matcher.PatternMatcher;
import org.apache.ivy.util.filter.Filter;
import org.apache.ivy.util.filter.NoFilter;
+import junit.framework.TestCase;
+
public class ModuleRulesTest extends TestCase {
private ModuleRules rules;