Repository: ant-ivy Updated Branches: refs/heads/master bb3ddfe42 -> 8cba88fa1
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/publish/PublishEngineTest.java ---------------------------------------------------------------------- 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.io.IOException; 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.parser.xml.XmlModuleDescriptorWriter; 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()); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/publish/PublishEventsTest.java ---------------------------------------------------------------------- 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.Collections; 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.parser.xml.XmlModuleDescriptorParser; 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. http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/report/ResolveReportTest.java ---------------------------------------------------------------------- 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.io.File; 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.core.settings.IvySettings; import org.apache.ivy.util.CacheCleaner; import org.apache.ivy.util.FileUtil; +import junit.framework.TestCase; + public class ResolveReportTest extends TestCase { private Ivy ivy; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java ---------------------------------------------------------------------- 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.search.SearchEngine; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.core.resolve; 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.DownloadStatus; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/resolve/ResolveTest.java ---------------------------------------------------------------------- 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 java.util.Set; 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.apache.ivy.util.StringUtils; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; +import junit.framework.TestCase; + /** * */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java ---------------------------------------------------------------------- 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.Arrays; 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.ivy.util.MockMessageLogger; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; +import junit.framework.TestCase; + public class RetrieveTest extends TestCase { - private Ivy ivy; - private File cache; + 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( http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/search/SearchTest.java ---------------------------------------------------------------------- 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.HashMap; 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.core.settings.IvySettings; 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(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/settings/ConfigureTest.java ---------------------------------------------------------------------- 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.File; 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(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/settings/IvySettingsTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.core.settings; 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.core.settings; 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.URLHandler; 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 */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java ---------------------------------------------------------------------- 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.io.IOException; 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.ChainVersionMatcher; import org.apache.ivy.plugins.version.MockVersionMatcher; import org.apache.ivy.plugins.version.VersionMatcher; +import junit.framework.TestCase; + /** * TODO write javadoc */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/core/sort/SortTest.java ---------------------------------------------------------------------- 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.Date; 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.circular.WarnCircularDependencyStrategy; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/core/AggregatedOSGiResolverTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.osgi.core; 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.repo.AggregatedOSGiResolver; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java ---------------------------------------------------------------------- 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.HashSet; 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java ---------------------------------------------------------------------- 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.Collections; 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.osgi.filter; 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java ---------------------------------------------------------------------- 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.File; 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"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java ---------------------------------------------------------------------- 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.Set; 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.DependencyResolver; 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( http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java ---------------------------------------------------------------------- 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.net.URI; 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.osgi.util.Version; 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); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.osgi.p2; 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.core.settings.IvySettings; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java ---------------------------------------------------------------------- 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.SAXTransformerFactory; 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.ivy.plugins.resolver.FileSystemResolver; 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"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.osgi.updatesite; 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.osgi.core.BundleInfo; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteLoaderTest.java ---------------------------------------------------------------------- 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.net.URISyntaxException; 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.CacheCleaner; import org.apache.ivy.util.CollectionUtils; import org.xml.sax.SAXException; +import junit.framework.TestCase; + public class UpdateSiteLoaderTest extends TestCase { private UpdateSiteLoader loader; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.osgi.updatesite; 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.core.settings.IvySettings; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java ---------------------------------------------------------------------- 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java ---------------------------------------------------------------------- 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.core.sort.SortEngine; import org.apache.ivy.util.Message; import org.apache.ivy.util.MockMessageLogger; +import junit.framework.TestCase; + public class WarnCircularDependencyStrategyTest extends TestCase { private CircularDependencyStrategy strategy; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.conflict; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java ---------------------------------------------------------------------- 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.io.File; 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.IvyNode; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.conflict; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.conflict; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.lock; 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.CopyProgressEvent; 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")); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java ---------------------------------------------------------------------- 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.namespace; 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( http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.parser; 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.ExcludeRule; 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++) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java ---------------------------------------------------------------------- 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.io.InputStream; 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, http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.parser.m2; 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.core.settings.IvySettings; 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 http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java ---------------------------------------------------------------------- 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.FileReader; 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java ---------------------------------------------------------------------- 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.HashMap; 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.plugins.repository.BasicResource; 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.report; 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 @@ public class XmlReportParserTest extends TestCase { 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(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java ---------------------------------------------------------------------- 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.ByteArrayInputStream; 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.CacheCleaner; import org.apache.ivy.util.XMLHelper; import org.xml.sax.helpers.DefaultHandler; +import junit.framework.TestCase; + public class XmlReportWriterTest extends TestCase { private Ivy _ivy; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java ---------------------------------------------------------------------- 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.File; 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 http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java ---------------------------------------------------------------------- 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.Collections; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java ---------------------------------------------------------------------- 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java ---------------------------------------------------------------------- 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.settings.IvySettings; 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 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java ---------------------------------------------------------------------- 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.core.sort.SortEngine; 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java ---------------------------------------------------------------------- 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.settings.IvySettings; 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 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.resolver; 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.ResolveOptions; 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 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest { 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.resolver; 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.settings.IvySettings; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.resolver; 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.settings.IvySettings; 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; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java ---------------------------------------------------------------------- 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.resolve.ResolvedModuleRevision; 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 @@ public class MirroredURLResolverTest extends TestCase { 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 @@ public class MirroredURLResolverTest extends TestCase { } 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.resolver; 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; + /** * */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java ---------------------------------------------------------------------- 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.io.File; 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.resolve.ResolvedModuleRevision; 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 @@ public class URLResolverTest extends AbstractDependencyResolverTest { 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 { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.resolver.util; 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() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.plugins.trigger; 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.FileUtil; 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"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java ---------------------------------------------------------------------- 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(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java ---------------------------------------------------------------------- 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()); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/util/IvyPatternHelperTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.util; 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]"; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java ---------------------------------------------------------------------- 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.IOException; 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 { /** http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.util.url; import java.io.File; import java.net.URL; -import junit.framework.TestCase; - import org.apache.ivy.util.FileUtil; +import junit.framework.TestCase; + /** * Test BasicURLHandler */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2d7c6f5f/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java ---------------------------------------------------------------------- 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 @@ package org.apache.ivy.util.url; 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 */
