setup proper loggers in unit tests and factorize the creation and the cleaning of the cache folder
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 @@
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.util.CacheCleaner;
import org.apache.ivy.util.MockMessageLogger;
+import junit.framework.TestCase;
+
public class IvyTest extends TestCase {
private File cache;
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 @@
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;
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.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.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 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();
+ }
}
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 @@
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 @@
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 @@
@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 @@
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 @@
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 @@
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]);
}
}
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 @@
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());
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.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.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());
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;
- }
-}
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.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 @@
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 @@
}
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 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();
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.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;
+
+import junit.framework.TestCase;
public class FixDepsTaskTest extends TestCase {
- private File cache;
-
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 {
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 @@
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 {
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 @@
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 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 {
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.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 @@
protected void setUp() throws Exception {
createCache();
- project = new Project();
+ project = TestHelper.newProject();
project.init();
buildlist = new IvyBuildList();
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 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 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();
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 @@
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.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 {
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 @@
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 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 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();
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 @@
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 @@
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();
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 @@
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.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 @@
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 @@
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
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 @@
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();
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.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.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 @@
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 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");
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 @@
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 {
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 @@
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 {
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 {
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 {
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 @@
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);
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 @@
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 @@
createCache();
cleanInstall();
- project = AntTestHelper.newProject();
+ project = TestHelper.newProject();
install = new IvyInstall();
install.setProject(project);
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 {
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 @@
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 @@
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() {
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.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.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 @@
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");
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
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.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 @@
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 @@
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)));
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 @@
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 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();
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.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,
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 @@
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 @@
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 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 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 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");
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 @@
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 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 void testIvyVersionAsAntProperty() {
- Project p = new Project();
+ Project p = TestHelper.newProject();
p.setBasedir("test/repositories");
IvyTask task = new IvyTask() {
public void doExecute() throws BuildException {
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 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 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 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();
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;
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.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 @@
private final Ivy ivy;
- private File cache;
-
public TestPerformance() throws Exception {
ivy = new Ivy();
FileSystemResolver resolver = new FileSystemResolver();
@@ -58,23 +57,11 @@
}
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() {
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.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.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
+import junit.framework.TestCase;
+
/**
* @see DefaultResolutionCacheManager
*/
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.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);
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.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 @@
deliverDir = new File("build/test/deliver");
deliverDir.mkdirs();
- Project project = new Project();
+ Project project = TestHelper.newProject();
project.init();
ivyDeliver = new IvyDeliver();
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 @@
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.id.ModuleRevisionId;
import org.apache.ivy.core.report.ResolveReport;
+import junit.framework.TestCase;
+
public class IvyEventFilterTest extends TestCase {
private ModuleDescriptor md = null;
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 @@
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 @@
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());
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 @@
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.util.filter.Filter;
import org.apache.ivy.util.filter.NoFilter;
+import junit.framework.TestCase;
+
public class ModuleRulesTest extends TestCase {
private ModuleRules rules;
diff --git a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java b/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
index bfa3912..cd87d5d 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
@@ -22,8 +22,6 @@
import java.text.ParseException;
import java.util.Arrays;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
@@ -39,6 +37,8 @@
import org.apache.ivy.plugins.resolver.FileSystemResolver;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class PublishEngineTest extends TestCase {
protected void setUp() throws Exception {
System.setProperty("ivy.cache.dir", new File("build/test/publish/cache").getAbsolutePath());
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index 0cd129d..d886ff5 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.event.IvyEvent;
@@ -40,6 +38,8 @@
import org.apache.ivy.plugins.resolver.MockResolver;
import org.apache.ivy.plugins.trigger.AbstractTrigger;
+import junit.framework.TestCase;
+
public class PublishEventsTest extends TestCase {
// maps ArtifactRevisionId to PublishTestCase instance.
diff --git a/test/java/org/apache/ivy/core/report/ResolveReportTest.java b/test/java/org/apache/ivy/core/report/ResolveReportTest.java
index 08b3cee..d96a2a6 100644
--- a/test/java/org/apache/ivy/core/report/ResolveReportTest.java
+++ b/test/java/org/apache/ivy/core/report/ResolveReportTest.java
@@ -21,8 +21,6 @@
import java.util.Arrays;
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
@@ -33,6 +31,8 @@
import org.apache.ivy.util.CacheCleaner;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class ResolveReportTest extends TestCase {
private Ivy ivy;
diff --git a/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java b/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java
index a62eb45..7d90a12 100644
--- a/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java
+++ b/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.ivy.core.repository;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestFixture;
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.event.EventManager;
@@ -27,6 +25,8 @@
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
+import junit.framework.TestCase;
+
public class RepositoryManagementEngineTest extends TestCase {
private RepositoryManagementEngine repository;
diff --git a/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java b/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
index cb1e8c2..a830254 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.util.Date;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.ArtifactOrigin;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -32,6 +30,8 @@
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.util.CacheCleaner;
+import junit.framework.TestCase;
+
public class ResolveEngineTest extends TestCase {
private Ivy ivy;
diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
index 7f734d4..ec666aa 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
@@ -34,8 +34,6 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.cache.ArtifactOrigin;
@@ -73,6 +71,8 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import junit.framework.TestCase;
+
/**
*
*/
diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
index ad313cf..b0482c6 100644
--- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
+++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
@@ -25,10 +25,9 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.SystemUtils;
import org.apache.ivy.Ivy;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.core.event.IvyEvent;
import org.apache.ivy.core.event.IvyListener;
@@ -46,38 +45,27 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-public class RetrieveTest extends TestCase {
- private Ivy ivy;
+import junit.framework.TestCase;
- private File cache;
+public class RetrieveTest extends TestCase {
+
+ private Ivy ivy;
protected void setUp() throws Exception {
ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/ivysettings.xml"));
- createCache();
- Message.setDefaultLogger(new DefaultMessageLogger(Message.MSG_DEBUG));
- }
-
- private void createCache() {
- cache = new File("build/cache");
- cache.mkdirs();
+ TestHelper.createCache();
+ Message.setDefaultLogger(new DefaultMessageLogger(Message.MSG_INFO));
}
protected void tearDown() throws Exception {
- cleanCache();
+ TestHelper.cleanCache();
Delete del = new Delete();
del.setProject(new Project());
del.setDir(new File("build/test/retrieve"));
del.execute();
}
- private void cleanCache() {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
- }
-
public void testRetrieveSimple() throws Exception {
// mod1.1 depends on mod1.2
ResolveReport report = ivy.resolve(new File(
diff --git a/test/java/org/apache/ivy/core/search/SearchTest.java b/test/java/org/apache/ivy/core/search/SearchTest.java
index 636b5b3..fbb3d4c 100644
--- a/test/java/org/apache/ivy/core/search/SearchTest.java
+++ b/test/java/org/apache/ivy/core/search/SearchTest.java
@@ -25,8 +25,6 @@
import java.util.HashSet;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -34,6 +32,8 @@
import org.apache.ivy.plugins.matcher.PatternMatcher;
import org.apache.ivy.plugins.resolver.IBiblioResolver;
+import junit.framework.TestCase;
+
public class SearchTest extends TestCase {
public void testListInMavenRepo() throws Exception {
Ivy ivy = Ivy.newInstance();
diff --git a/test/java/org/apache/ivy/core/settings/ConfigureTest.java b/test/java/org/apache/ivy/core/settings/ConfigureTest.java
index abcfe06..bbd799d 100644
--- a/test/java/org/apache/ivy/core/settings/ConfigureTest.java
+++ b/test/java/org/apache/ivy/core/settings/ConfigureTest.java
@@ -21,13 +21,13 @@
import java.io.IOException;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.plugins.resolver.IBiblioResolver;
import org.apache.ivy.plugins.resolver.IvyRepResolver;
+import junit.framework.TestCase;
+
public class ConfigureTest extends TestCase {
public void testDefault() throws ParseException, IOException {
Ivy ivy = new Ivy();
diff --git a/test/java/org/apache/ivy/core/settings/IvySettingsTest.java b/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
index 024c5fa..caa07ea 100644
--- a/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
+++ b/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
@@ -20,11 +20,11 @@
import java.io.IOException;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.plugins.resolver.DependencyResolver;
+import junit.framework.TestCase;
+
public class IvySettingsTest extends TestCase {
public void testChangeDefaultResolver() throws ParseException, IOException {
diff --git a/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
index 747f412..6af7bf7 100644
--- a/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
+++ b/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
@@ -19,8 +19,6 @@
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.ivy.plugins.resolver.ChainResolver;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.plugins.resolver.IvyRepResolver;
@@ -28,6 +26,8 @@
import org.apache.ivy.util.url.URLHandlerDispatcher;
import org.apache.ivy.util.url.URLHandlerRegistry;
+import junit.framework.TestCase;
+
/**
* split from XmlIvyConfigurationParserTest due to dependency on network resource
*/
diff --git a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
index 6ade1b4..2cf0ae1 100644
--- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
+++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
@@ -22,8 +22,6 @@
import java.text.ParseException;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
import org.apache.ivy.core.cache.ResolutionCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -49,6 +47,8 @@
import org.apache.ivy.plugins.version.MockVersionMatcher;
import org.apache.ivy.plugins.version.VersionMatcher;
+import junit.framework.TestCase;
+
/**
* TODO write javadoc
*/
diff --git a/test/java/org/apache/ivy/core/sort/SortTest.java b/test/java/org/apache/ivy/core/sort/SortTest.java
index 96d5b64..9c15124 100644
--- a/test/java/org/apache/ivy/core/sort/SortTest.java
+++ b/test/java/org/apache/ivy/core/sort/SortTest.java
@@ -24,9 +24,6 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
@@ -38,6 +35,9 @@
import org.apache.ivy.plugins.version.ExactVersionMatcher;
import org.apache.ivy.plugins.version.LatestVersionMatcher;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
public class SortTest extends TestCase {
private DefaultModuleDescriptor md1;
diff --git a/test/java/org/apache/ivy/osgi/core/AggregatedOSGiResolverTest.java b/test/java/org/apache/ivy/osgi/core/AggregatedOSGiResolverTest.java
index f14ae4e..245029f 100644
--- a/test/java/org/apache/ivy/osgi/core/AggregatedOSGiResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/core/AggregatedOSGiResolverTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -41,6 +39,8 @@
import org.apache.ivy.osgi.updatesite.UpdateSiteResolver;
import org.apache.ivy.plugins.resolver.DependencyResolver;
+import junit.framework.TestCase;
+
public class AggregatedOSGiResolverTest extends TestCase {
private IvySettings settings;
diff --git a/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java b/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
index 3cfc576..76d60fa 100644
--- a/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
+++ b/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
@@ -23,10 +23,10 @@
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.ivy.osgi.util.VersionRange;
+import junit.framework.TestCase;
+
public class ManifestParserTest extends TestCase {
public void testParseManifest() throws Exception {
diff --git a/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java b/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java
index 9b8ab08..e5da408 100644
--- a/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java
+++ b/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java
@@ -23,10 +23,10 @@
import java.util.Date;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.ivy.plugins.latest.ArtifactInfo;
+import junit.framework.TestCase;
+
public class OsgiLatestStrategyTest extends TestCase {
public void testComparator() {
diff --git a/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java b/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java
index 134b484..6737a9a 100644
--- a/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java
+++ b/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java
@@ -19,11 +19,11 @@
import java.text.ParseException;
+import org.apache.ivy.osgi.filter.CompareFilter.Operator;
+
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ivy.osgi.filter.CompareFilter.Operator;
-
public class OSGiFilterTest extends TestCase {
public void testParser() throws Exception {
diff --git a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
index 56dbac5..c8e6878 100644
--- a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
+++ b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
@@ -21,14 +21,14 @@
import java.io.FileInputStream;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.osgi.obr.xml.OBRXMLParser;
import org.apache.ivy.osgi.repo.BundleRepoDescriptor;
import org.apache.ivy.osgi.repo.ModuleDescriptorWrapper;
import org.apache.ivy.util.CollectionUtils;
+import junit.framework.TestCase;
+
public class OBRParserTest extends TestCase {
private File testObr = new File("test/test-obr");
diff --git a/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java b/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
index 0a97e8a..93e5b95 100644
--- a/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
@@ -27,9 +27,6 @@
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -56,6 +53,9 @@
import org.apache.ivy.plugins.resolver.DualResolver;
import org.apache.ivy.plugins.resolver.FileSystemResolver;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
public class OBRResolverTest extends TestCase {
private static final ModuleRevisionId MRID_TEST_BUNDLE = ModuleRevisionId.newInstance(
diff --git a/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java b/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
index 8f5c569..59e47a4 100644
--- a/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
+++ b/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
@@ -24,8 +24,6 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.osgi.core.BundleArtifact;
import org.apache.ivy.osgi.core.BundleInfo;
@@ -37,6 +35,8 @@
import org.apache.ivy.util.CollectionUtils;
import org.xml.sax.ContentHandler;
+import junit.framework.TestCase;
+
public class OBRXMLWriterTest extends TestCase {
private static final Version BUNDLE_VERSION = new Version(1, 2, 3, null);
diff --git a/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java b/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
index f1766a9..1ab2dc2 100644
--- a/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
+++ b/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
@@ -19,8 +19,6 @@
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -37,6 +35,8 @@
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.osgi.updatesite.UpdateSiteResolver;
+import junit.framework.TestCase;
+
public class P2DescriptorTest extends TestCase {
private File cache;
diff --git a/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java b/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
index 3e23d75..a3c2b80 100644
--- a/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
+++ b/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
@@ -29,8 +29,6 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.osgi.core.ExecutionEnvironmentProfileProvider;
import org.apache.ivy.osgi.obr.xml.OBRXMLParser;
@@ -40,6 +38,8 @@
import org.apache.tools.ant.BuildException;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
public class BundleRepoTest extends TestCase {
private File bundlerepo = new File("test/test-repo/bundlerepo");
diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
index 0d83910..d5d8d4a 100644
--- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -35,6 +33,8 @@
import org.apache.ivy.plugins.resolver.ChainResolver;
import org.apache.ivy.plugins.resolver.IBiblioResolver;
+import junit.framework.TestCase;
+
public class UpdateSiteAndIbiblioResolverTest extends TestCase {
private IvySettings settings;
diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java
index 7397d33..fa4d40a 100644
--- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java
+++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java
@@ -24,8 +24,6 @@
import java.text.ParseException;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.cache.CacheResourceOptions;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.settings.IvySettings;
@@ -35,6 +33,8 @@
import org.apache.ivy.util.CollectionUtils;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
public class UpdateSiteLoaderTest extends TestCase {
private UpdateSiteLoader loader;
diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
index da0a0b2..648b504 100644
--- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -40,6 +38,8 @@
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.plugins.resolver.DependencyResolver;
+import junit.framework.TestCase;
+
public class UpdateSiteResolverTest extends TestCase {
private IvySettings settings;
diff --git a/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
index a108a23..2c60c35 100644
--- a/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.ivy.plugins.circular;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestHelper;
import org.apache.ivy.util.Message;
import org.apache.ivy.util.MockMessageLogger;
+import junit.framework.TestCase;
+
public class IgnoreCircularDependencyStrategyTest extends TestCase {
private CircularDependencyStrategy strategy;
diff --git a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
index 616f016..3901ce3 100644
--- a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.ivy.plugins.circular;
-import junit.framework.TestCase;
-
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.event.EventManager;
@@ -30,6 +28,8 @@
import org.apache.ivy.util.Message;
import org.apache.ivy.util.MockMessageLogger;
+import junit.framework.TestCase;
+
public class WarnCircularDependencyStrategyTest extends TestCase {
private CircularDependencyStrategy strategy;
diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
index 5d63088..e8fb3ba 100644
--- a/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
@@ -20,14 +20,14 @@
import java.io.IOException;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.TestFixture;
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.report.ConfigurationResolveReport;
import org.apache.ivy.core.report.ResolveReport;
+import junit.framework.TestCase;
+
public class LatestCompatibleConflictManagerTest extends TestCase {
private TestFixture fixture;
diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
index 2596e0a..f7d61ab 100644
--- a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
@@ -21,8 +21,6 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.ConfigurationResolveReport;
@@ -31,6 +29,8 @@
import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class LatestConflictManagerTest extends TestCase {
private Ivy ivy;
diff --git a/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
index d81015c..c97a6ad 100644
--- a/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
@@ -19,12 +19,12 @@
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class RegexpConflictManagerTest extends TestCase {
private Ivy ivy;
diff --git a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
index 1b6fc70..259de1d 100644
--- a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
@@ -19,12 +19,12 @@
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class StrictConflictManagerTest extends TestCase {
private Ivy ivy;
diff --git a/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java b/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
index 7ba4080..09fecb2 100644
--- a/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.text.ParseException;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
import org.apache.ivy.core.cache.RepositoryCacheManager;
import org.apache.ivy.core.event.EventManager;
@@ -40,6 +38,8 @@
import org.apache.ivy.util.FileUtil;
import org.apache.ivy.util.Message;
+import junit.framework.TestCase;
+
public class ArtifactLockStrategyTest extends TestCase {
protected void setUp() throws Exception {
FileUtil.forceDelete(new File("build/test/cache"));
diff --git a/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java b/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java
index bfb60ac..2668368 100644
--- a/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java
+++ b/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java
@@ -17,10 +17,10 @@
*/
package org.apache.ivy.plugins.namespace;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.id.ModuleRevisionId;
+import junit.framework.TestCase;
+
public class MRIDTransformationRuleTest extends TestCase {
public void testTransformation() {
diff --git a/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java b/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
index 5b0a15b..f1ef074 100644
--- a/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
+++ b/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
@@ -20,13 +20,13 @@
import java.util.Collections;
import java.util.Date;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
import org.apache.ivy.core.module.id.ArtifactRevisionId;
import org.apache.ivy.core.module.id.ModuleRevisionId;
+import junit.framework.TestCase;
+
public class NameSpaceHelperTest extends TestCase {
public void testTransformArtifactWithExtraAttributes() throws Exception {
Artifact artifact = new DefaultArtifact(ArtifactRevisionId.newInstance(
diff --git a/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java b/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java
index a582e74..c50da89 100644
--- a/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java
+++ b/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java
@@ -19,8 +19,6 @@
import java.util.Arrays;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.Configuration;
import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
@@ -30,6 +28,8 @@
import org.apache.ivy.core.module.descriptor.IncludeRule;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import junit.framework.TestCase;
+
public abstract class AbstractModuleDescriptorParserTester extends TestCase {
protected DependencyDescriptor getDependency(DependencyDescriptor[] dependencies, String name) {
for (int i = 0; i < dependencies.length; i++) {
diff --git a/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java b/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java
index b12d54e..267ed74 100644
--- a/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java
@@ -23,14 +23,14 @@
import java.net.URL;
import java.text.ParseException;
-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.repository.Resource;
+import junit.framework.TestCase;
+
public class ModuleDescriptorParserRegistryTest extends TestCase {
public static class MyParser extends AbstractModuleDescriptorParser {
public ModuleDescriptor parseDescriptor(ParserSettings ivy, URL descriptorURL,
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
index 3b3c323..6f60ace 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
@@ -19,7 +19,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import java.text.ParseException;
import java.util.Arrays;
@@ -42,13 +41,9 @@
import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParserTester;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest;
-import org.apache.ivy.plugins.repository.BasicResource;
-import org.apache.ivy.plugins.repository.LazyResource;
-import org.apache.ivy.plugins.repository.Resource;
import org.apache.ivy.plugins.repository.url.URLResource;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.plugins.resolver.MockResolver;
-import org.xml.sax.SAXException;
public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParserTester {
// junit test -- DO NOT REMOVE used by ant to know it's a junit test
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
index d37a869..a060bf4 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
@@ -23,13 +23,13 @@
import java.io.IOException;
import java.io.InputStreamReader;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry;
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
public class PomModuleDescriptorWriterTest extends TestCase {
private static String LICENSE;
static {
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
index 9f50b7e..89e3b57 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
@@ -32,8 +32,6 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.Configuration;
@@ -45,6 +43,8 @@
import org.apache.ivy.util.FileUtil;
import org.xml.sax.SAXParseException;
+import junit.framework.TestCase;
+
public class XmlModuleUpdaterTest extends TestCase {
protected void tearDown() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java b/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java
index e1309db..8a80a3f 100644
--- a/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java
+++ b/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java
@@ -19,44 +19,30 @@
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.core.resolve.ResolveOptions;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.TestCase;
public class XmlReportParserTest extends TestCase {
- private Ivy _ivy;
- private File _cache;
+ private Ivy ivy;
protected void setUp() throws Exception {
- _ivy = new Ivy();
- _ivy.configure(new File("test/repositories/ivysettings.xml"));
- createCache();
- }
-
- private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ ivy = new Ivy();
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
+ 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();
}
public void testGetResolvedModule() throws Exception {
- ResolveReport report = _ivy.resolve(
+ ResolveReport report = ivy.resolve(
new File("test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"),
getResolveOptions(new String[] {"default"}).setValidate(false).setResolveId(
"testGetResolvedModule"));
@@ -65,7 +51,7 @@
ModuleRevisionId modRevId = report.getModuleDescriptor().getModuleRevisionId();
XmlReportParser parser = new XmlReportParser();
- parser.parse(_ivy.getResolutionCacheManager().getConfigurationResolveReportInCache(
+ parser.parse(ivy.getResolutionCacheManager().getConfigurationResolveReportInCache(
"testGetResolvedModule", "default"));
ModuleRevisionId parsedModRevId = parser.getResolvedModule();
diff --git a/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java b/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java
index 3da205c..1ba7d4b 100644
--- a/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java
+++ b/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java
@@ -21,8 +21,6 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.core.resolve.ResolveOptions;
@@ -30,6 +28,8 @@
import org.apache.ivy.util.XMLHelper;
import org.xml.sax.helpers.DefaultHandler;
+import junit.framework.TestCase;
+
public class XmlReportWriterTest extends TestCase {
private Ivy _ivy;
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
index 16b9f0f..ec70ba8 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
@@ -21,10 +21,10 @@
import java.io.IOException;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
/**
* Testing Testing was the single biggest hurdle I faced. I have tried to provide a complete test
* suite that covers all protocols and which can be easily extended. It does differ - somewhat - in
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
index 699ed1c..d79e4d9 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
@@ -24,10 +24,10 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.StringUtils;
+import junit.framework.TestCase;
+
public class VfsResourceTest extends TestCase {
private VfsTestHelper helper = null;
diff --git a/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java
index 9fddc2b..40bf4f2 100644
--- a/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java
@@ -17,10 +17,10 @@
*/
package org.apache.ivy.plugins.resolver;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.resolve.DownloadOptions;
+import junit.framework.TestCase;
+
public class AbstractDependencyResolverTest extends TestCase {
protected DownloadOptions downloadOptions() {
diff --git a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java
index fdcf9ae..a3596f7 100644
--- a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java
@@ -17,8 +17,7 @@
*/
package org.apache.ivy.plugins.resolver;
-import java.io.File;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -38,8 +37,6 @@
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
import org.apache.ivy.util.MockMessageLogger;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
public class BintrayResolverTest extends AbstractDependencyResolverTest {
@@ -49,24 +46,17 @@
private ResolveData _data;
- private File _cache;
-
@Override
protected void setUp() throws Exception {
_settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
- _cache = new File("build/cache");
_data = new ResolveData(_engine, new ResolveOptions());
- _cache.mkdirs();
- _settings.setDefaultCache(_cache);
+ _settings.setDefaultCache(TestHelper.cache);
}
@Override
protected void tearDown() throws Exception {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(_cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testDefaults() {
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index 18c049b..9ff1a39 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.ivy.plugins.resolver;
-import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -44,35 +44,28 @@
import org.apache.ivy.plugins.latest.LatestRevisionStrategy;
import org.apache.ivy.plugins.latest.LatestTimeStrategy;
import org.apache.ivy.util.MockMessageLogger;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
/**
* Tests ChainResolver
*/
public class ChainResolverTest extends AbstractDependencyResolverTest {
+
private IvySettings settings;
private ResolveEngine engine;
private ResolveData data;
- private File cache;
-
protected void setUp() throws Exception {
settings = new IvySettings();
engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings));
- cache = new File("build/cache");
+ TestHelper.createCache();
data = new ResolveData(engine, new ResolveOptions());
- cache.mkdirs();
- settings.setDefaultCache(cache);
+ settings.setDefaultCache(TestHelper.cache);
}
protected void tearDown() throws Exception {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testOrderFromConf() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
index de79421..29291ce 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.ivy.plugins.resolver;
-import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.core.event.EventManager;
@@ -47,8 +47,6 @@
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
import org.apache.ivy.util.MockMessageLogger;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
/**
*
@@ -62,22 +60,16 @@
private ResolveData _data;
- private File _cache;
-
protected void setUp() throws Exception {
_settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
- _cache = new File("build/cache");
_data = new ResolveData(_engine, new ResolveOptions());
- _cache.mkdirs();
- _settings.setDefaultCache(_cache);
+ TestHelper.createCache();
+ _settings.setDefaultCache(TestHelper.cache);
}
protected void tearDown() throws Exception {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(_cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testDefaults() {
diff --git a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
index cda5a69..322c576 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
@@ -20,6 +20,7 @@
import java.io.File;
import java.util.List;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
@@ -34,8 +35,6 @@
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
/**
*
@@ -47,22 +46,16 @@
private ResolveData _data;
- private File _cache;
-
protected void setUp() throws Exception {
_settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
- _cache = new File("build/cache");
_data = new ResolveData(_engine, new ResolveOptions());
- _cache.mkdirs();
- _settings.setDefaultCache(_cache);
+ TestHelper.createCache();
+ _settings.setDefaultCache(TestHelper.cache);
}
protected void tearDown() throws Exception {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(_cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testDefaults() {
diff --git a/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java
index 8226eee..86570c8 100644
--- a/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java
@@ -19,8 +19,6 @@
import java.io.File;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
@@ -33,6 +31,8 @@
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.util.CacheCleaner;
+import junit.framework.TestCase;
+
public class JarResolverTest extends TestCase {
private IvySettings settings;
diff --git a/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java b/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java
index 48f7ab1..b49ab55 100644
--- a/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.net.MalformedURLException;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -33,6 +31,8 @@
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.util.CacheCleaner;
+import junit.framework.TestCase;
+
public class Maven2LocalTest extends TestCase {
private IvySettings settings;
diff --git a/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java
index 82d6fdb..06b0ea9 100644
--- a/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java
@@ -17,10 +17,7 @@
*/
package org.apache.ivy.plugins.resolver;
-import java.io.File;
-
-import junit.framework.TestCase;
-
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -31,8 +28,8 @@
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.settings.XmlSettingsParser;
import org.apache.ivy.core.sort.SortEngine;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
+
+import junit.framework.TestCase;
public class MirroredURLResolverTest extends TestCase {
@@ -42,15 +39,12 @@
private ResolveData data;
- private File cache;
-
protected void setUp() throws Exception {
settings = new IvySettings();
engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings));
- cache = new File("build/cache");
data = new ResolveData(engine, new ResolveOptions());
- cache.mkdirs();
- settings.setDefaultCache(cache);
+ TestHelper.createCache();
+ settings.setDefaultCache(TestHelper.cache);
settings.setVariable("test.mirroredurl.mirrorlist-solo.url",
this.getClass().getResource("mirrorlist-solo.txt").toExternalForm());
settings.setVariable("test.mirroredurl.mirrorlist-failover.url", this.getClass()
@@ -62,10 +56,7 @@
}
protected void tearDown() throws Exception {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testSolo() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
index 169b6e1..e0d941b 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
@@ -19,12 +19,12 @@
import java.util.Arrays;
-import junit.framework.Assert;
-
import org.apache.ivy.core.search.ModuleEntry;
import org.apache.ivy.core.search.OrganisationEntry;
import org.apache.ivy.core.search.RevisionEntry;
+import junit.framework.Assert;
+
/**
*
*/
diff --git a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
index 067436a..e5380ea 100644
--- a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
@@ -21,6 +21,7 @@
import java.util.Date;
import java.util.GregorianCalendar;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -40,8 +41,6 @@
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
/**
* Tests URLResolver. Http tests are based upon ibiblio site.
@@ -54,22 +53,16 @@
private ResolveData data;
- private File cache;
-
protected void setUp() throws Exception {
settings = new IvySettings();
engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings));
- cache = new File("build/cache");
data = new ResolveData(engine, new ResolveOptions());
- cache.mkdirs();
- settings.setDefaultCache(cache);
+ TestHelper.createCache();
+ settings.setDefaultCache(TestHelper.cache);
}
protected void tearDown() throws Exception {
- Delete del = new Delete();
- del.setProject(new Project());
- del.setDir(cache);
- del.execute();
+ TestHelper.cleanCache();
}
public void testFile() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java b/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
index dfe6e2d..4d6bc67 100644
--- a/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
@@ -20,10 +20,10 @@
import java.io.File;
import java.util.Arrays;
-import junit.framework.TestCase;
-
import org.apache.ivy.plugins.repository.file.FileRepository;
+import junit.framework.TestCase;
+
public class ResolverHelperTest extends TestCase {
public void testListTokenValuesForIvy1238() {
diff --git a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
index 27bab56..884c9be 100644
--- a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
+++ b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
@@ -20,8 +20,6 @@
import java.io.File;
import java.util.Date;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.event.resolve.StartResolveEvent;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -29,6 +27,8 @@
import org.apache.ivy.util.Message;
import org.apache.ivy.util.MockMessageLogger;
+import junit.framework.TestCase;
+
public class LogTriggerTest extends TestCase {
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
diff --git a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
index f3f378e..1450326 100644
--- a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
@@ -17,10 +17,10 @@
*/
package org.apache.ivy.plugins.version;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.id.ModuleRevisionId;
+import junit.framework.TestCase;
+
public class PatternVersionMatcherTest extends TestCase {
public void testSingleMatch() {
PatternVersionMatcher pvm = new PatternVersionMatcher();
diff --git a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
index e1dd779..0e1e8d1 100644
--- a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.ivy.plugins.version;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.plugins.latest.LatestRevisionStrategy;
+import junit.framework.TestCase;
+
public class VersionRangeMatcherTest extends TestCase {
VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy());
diff --git a/test/java/org/apache/ivy/util/IvyPatternHelperTest.java b/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
index 20f42be..694408e 100644
--- a/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
+++ b/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
@@ -20,10 +20,10 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.IvyPatternHelper;
+import junit.framework.TestCase;
+
public class IvyPatternHelperTest extends TestCase {
public void testSubstitute() {
String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]";
diff --git a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
index fdd53af..0f1ff1a 100644
--- a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
@@ -22,10 +22,10 @@
import java.io.InputStream;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.ivy.util.CopyProgressListener;
+import junit.framework.TestCase;
+
public class AbstractURLHandlerTest extends TestCase {
/**
diff --git a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java
index 6956088..8ce9955 100644
--- a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java
@@ -20,10 +20,10 @@
import java.io.File;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.ivy.util.FileUtil;
+import junit.framework.TestCase;
+
/**
* Test BasicURLHandler
*/
diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
index 630a973..e88263e 100644
--- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
@@ -20,11 +20,11 @@
import java.io.File;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.ivy.util.FileUtil;
import org.apache.ivy.util.url.URLHandler.URLInfo;
+import junit.framework.TestCase;
+
/**
* Test HttpClientHandler
*/