Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java Wed Jan 31 03:00:29 2007 @@ -25,7 +25,8 @@ import junit.framework.TestCase; -import org.apache.ivy.Ivy; +import org.apache.ivy.core.cache.CacheManager; +import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.DefaultArtifact; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; @@ -33,14 +34,17 @@ import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.core.report.DownloadReport; import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.DownloadOptions; import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolveEngine; import org.apache.ivy.core.resolve.ResolvedModuleRevision; import org.apache.ivy.core.search.ModuleEntry; import org.apache.ivy.core.search.OrganisationEntry; import org.apache.ivy.core.search.RevisionEntry; +import org.apache.ivy.core.settings.IvySettings; +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.plugins.resolver.FileSystemResolver; import org.apache.ivy.util.FileUtil; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; @@ -53,18 +57,25 @@ private static final String FS = System.getProperty("file.separator"); private static final String IVY_PATTERN = "test"+FS+"repositories"+FS+"1"+FS+"[organisation]"+FS+"[module]"+FS+"ivys"+FS+"ivy-[revision].xml"; - private File _cache; + private IvySettings _settings; + private ResolveEngine _engine; private ResolveData _data; - private Ivy _ivy = new Ivy(); + private File _cache; + private CacheManager _cacheManager; + public FileSystemResolverTest() { setupLastModified(); } 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(_ivy, _cache, null, null, true); + _data = new ResolveData(_engine, _cache, null, null, true); _cache.mkdirs(); + _cacheManager = new CacheManager(_settings, _cache); + _settings.setDefaultCache(_cache); } private void setupLastModified() { @@ -90,7 +101,7 @@ public void testFixedRevision() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -107,7 +118,7 @@ // test to ask to download DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache, false); + DownloadReport report = resolver.download(new Artifact[] {artifact}, getDownloadOptions(false)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -119,7 +130,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache, false); + report = resolver.download(new Artifact[] {artifact}, getDownloadOptions(false)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -131,10 +142,14 @@ assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } - public void testMaven2() throws Exception { + private DownloadOptions getDownloadOptions(boolean useOrigin) { + return new DownloadOptions(_settings, _cacheManager, null, useOrigin); + } + + public void testMaven2() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); resolver.setM2compatible(true); assertEquals("test", resolver.getName()); @@ -154,7 +169,7 @@ public void testChecksum() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); resolver.addIvyPattern("test/repositories/checksums/[module]/[artifact]-[revision].[ext]"); resolver.addArtifactPattern("test/repositories/checksums/[module]/[artifact]-[revision].[ext]"); @@ -163,7 +178,7 @@ ModuleRevisionId mrid = ModuleRevisionId.newInstance("test", "allright", "1.0"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); assertNotNull(rmr); - DownloadReport dr = resolver.download(rmr.getDescriptor().getAllArtifacts(), _ivy, _cache, false); + DownloadReport dr = resolver.download(rmr.getDescriptor().getAllArtifacts(), getDownloadOptions(false)); assertEquals(2, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length); resolver.setChecksums("md5"); @@ -173,28 +188,28 @@ resolver.setChecksums("none"); rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); assertNotNull(rmr); - dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, _ivy, _cache, false); + dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, getDownloadOptions(false)); assertEquals(1, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length); resolver.setChecksums("md5"); mrid = ModuleRevisionId.newInstance("test", "badartcs", "1.0"); rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); assertNotNull(rmr); - dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, _ivy, _cache, false); + dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, getDownloadOptions(false)); assertEquals(1, dr.getArtifactsReports(DownloadStatus.FAILED).length); resolver.setChecksums(""); rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); assertNotNull(rmr); - dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, _ivy, _cache, false); + dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, getDownloadOptions(false)); assertEquals(1, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length); } public void testCheckModified() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); - _ivy.addResolver(resolver); + resolver.setSettings(_settings); + _settings.addResolver(resolver); assertEquals("test", resolver.getName()); resolver.addIvyPattern("test"+FS+"repositories"+FS+"checkmodified"+FS+"ivy-[revision].xml"); @@ -235,8 +250,8 @@ public void testNoRevision() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); - _ivy.addResolver(resolver); + resolver.setSettings(_settings); + _settings.addResolver(resolver); assertEquals("test", resolver.getName()); resolver.addIvyPattern("test"+FS+"repositories"+FS+"norevision"+FS+"ivy-[module].xml"); @@ -258,8 +273,8 @@ assertEquals(pubdate, rmr.getPublicationDate()); Artifact[] artifacts = rmr.getDescriptor().getArtifacts("default"); - File archiveFileInCache = _ivy.getArchiveFileInCache(_cache, artifacts[0]); - resolver.download(artifacts, _ivy, _cache, false); + File archiveFileInCache = _cacheManager.getArchiveFileInCache(artifacts[0]); + resolver.download(artifacts, getDownloadOptions(false)); assertTrue(archiveFileInCache.exists()); BufferedReader r = new BufferedReader(new FileReader(archiveFileInCache)); assertEquals("before", r.readLine()); @@ -281,13 +296,13 @@ assertEquals(pubdate, rmr.getPublicationDate()); artifacts = rmr.getDescriptor().getArtifacts("default"); - archiveFileInCache = _ivy.getArchiveFileInCache(_cache, artifacts[0]); + archiveFileInCache = _cacheManager.getArchiveFileInCache(artifacts[0]); assertFalse(archiveFileInCache.exists()); // should download the new artifact artifacts = rmr.getDescriptor().getArtifacts("default"); - resolver.download(artifacts, _ivy, _cache, false); + resolver.download(artifacts, getDownloadOptions(false)); assertTrue(archiveFileInCache.exists()); r = new BufferedReader(new FileReader(archiveFileInCache)); assertEquals("after", r.readLine()); @@ -297,8 +312,8 @@ public void testChanging() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); - _ivy.addResolver(resolver); + resolver.setSettings(_settings); + _settings.addResolver(resolver); assertEquals("test", resolver.getName()); resolver.addIvyPattern("test"+FS+"repositories"+FS+"checkmodified"+FS+"ivy-[revision].xml"); @@ -320,8 +335,8 @@ assertEquals(pubdate, rmr.getPublicationDate()); Artifact[] artifacts = rmr.getDescriptor().getArtifacts("default"); - resolver.download(artifacts, _ivy, _cache, false); - File archiveFileInCache = _ivy.getArchiveFileInCache(_cache, artifacts[0]); + resolver.download(artifacts, getDownloadOptions(false)); + File archiveFileInCache = _cacheManager.getArchiveFileInCache(artifacts[0]); assertTrue(archiveFileInCache.exists()); BufferedReader r = new BufferedReader(new FileReader(archiveFileInCache)); assertEquals("before", r.readLine()); @@ -357,7 +372,7 @@ assertFalse(archiveFileInCache.exists()); artifacts = rmr.getDescriptor().getArtifacts("default"); - resolver.download(artifacts, _ivy, _cache, false); + resolver.download(artifacts, getDownloadOptions(false)); assertTrue(archiveFileInCache.exists()); r = new BufferedReader(new FileReader(archiveFileInCache)); assertEquals("after", r.readLine()); @@ -367,7 +382,7 @@ public void testLatestTime() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -387,7 +402,7 @@ public void testLatestRevision() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -407,7 +422,7 @@ public void testRelativePath() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(new File("src/java").getAbsolutePath()+"/../../"+IVY_PATTERN); @@ -427,7 +442,7 @@ public void testFormattedLatestTime() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -447,7 +462,7 @@ public void testFormattedLatestRevision() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -468,7 +483,7 @@ try { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern("test"+FS+"repositories"+FS+"1"+FS+"[organisation]"+FS+"[module]"+FS+"[revision]"+FS+"[artifact].[ext]"); @@ -494,7 +509,7 @@ public void testListing() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -519,7 +534,7 @@ public void testDownloadWithUseOriginIsTrue() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); resolver.addIvyPattern(IVY_PATTERN); @@ -536,7 +551,7 @@ // test to ask to download DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache, true); + DownloadReport report = resolver.download(new Artifact[] {artifact}, getDownloadOptions(true)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java Wed Jan 31 03:00:29 2007 @@ -22,7 +22,8 @@ import junit.framework.TestCase; -import org.apache.ivy.Ivy; +import org.apache.ivy.core.cache.CacheManager; +import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.DefaultArtifact; import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor; @@ -31,10 +32,13 @@ import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.core.report.DownloadReport; import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.DownloadOptions; import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolveEngine; 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.ivy.plugins.resolver.IBiblioResolver; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; @@ -45,15 +49,21 @@ public class IBiblioResolverTest extends TestCase { // remote.test - private File _cache; + private IvySettings _settings; + private ResolveEngine _engine; private ResolveData _data; - private Ivy _ivy; + private File _cache; + private CacheManager _cacheManager; + protected void setUp() throws Exception { + _settings = new IvySettings(); + _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); _cache = new File("build/cache"); - _ivy = new Ivy(); - _data = new ResolveData(_ivy, _cache, null, null, true); + _data = new ResolveData(_engine, _cache, null, null, true); _cache.mkdirs(); + _cacheManager = new CacheManager(_settings, _cache); + _settings.setDefaultCache(_cache); } protected void tearDown() throws Exception { @@ -65,10 +75,9 @@ public void testDefaults() { IBiblioResolver resolver = new IBiblioResolver(); - Ivy ivy = new Ivy(); - ivy.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/mymaven/";); - ivy.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); - resolver.setIvy(ivy); + _settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/mymaven/";); + _settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); + resolver.setSettings(_settings); List l = resolver.getArtifactPatterns(); assertNotNull(l); assertEquals(1, l.size()); @@ -76,27 +85,26 @@ } public void testInitFromConf() throws Exception { - Ivy ivy = new Ivy(); - ivy.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/maven/";); - ivy.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); - ivy.setVariable("my.ibiblio.root", "http://www.ibiblio.org/mymaven/";); - ivy.setVariable("my.ibiblio.pattern", "[module]/[artifact]-[revision].jar"); - ivy.configure(IBiblioResolverTest.class.getResource("ibiblioresolverconf.xml")); - IBiblioResolver resolver = (IBiblioResolver)ivy.getResolver("ibiblioA"); + _settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/maven/";); + _settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); + _settings.setVariable("my.ibiblio.root", "http://www.ibiblio.org/mymaven/";); + _settings.setVariable("my.ibiblio.pattern", "[module]/[artifact]-[revision].jar"); + _settings.load(IBiblioResolverTest.class.getResource("ibiblioresolverconf.xml")); + IBiblioResolver resolver = (IBiblioResolver)_settings.getResolver("ibiblioA"); assertNotNull(resolver); List l = resolver.getArtifactPatterns(); assertNotNull(l); assertEquals(1, l.size()); assertEquals("http://www.ibiblio.org/mymaven/[module]/[artifact]-[revision].jar";, l.get(0)); - resolver = (IBiblioResolver)ivy.getResolver("ibiblioB"); + resolver = (IBiblioResolver)_settings.getResolver("ibiblioB"); assertNotNull(resolver); l = resolver.getArtifactPatterns(); assertNotNull(l); assertEquals(1, l.size()); assertEquals("http://www.ibiblio.org/mymaven/[organisation]/jars/[artifact]-[revision].jar";, l.get(0)); - resolver = (IBiblioResolver)ivy.getResolver("ibiblioC"); + resolver = (IBiblioResolver)_settings.getResolver("ibiblioC"); assertTrue(resolver.isM2compatible()); assertNotNull(resolver); l = resolver.getArtifactPatterns(); @@ -104,7 +112,7 @@ assertEquals(1, l.size()); assertEquals("http://www.ibiblio.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]";, l.get(0)); - resolver = (IBiblioResolver)ivy.getResolver("ibiblioD"); + resolver = (IBiblioResolver)_settings.getResolver("ibiblioD"); assertFalse(resolver.isM2compatible()); assertNotNull(resolver); l = resolver.getArtifactPatterns(); @@ -122,7 +130,7 @@ IBiblioResolver resolver = new IBiblioResolver(); resolver.setRoot(ibiblioRoot); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-fileupload", "1.0"); @@ -131,7 +139,7 @@ assertEquals(mrid, rmr.getId()); DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "commons-fileupload", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -143,7 +151,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -164,7 +172,7 @@ IBiblioResolver resolver = new IBiblioResolver(); resolver.setRoot(ibiblioRoot); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "nanning", "0.9"); @@ -177,7 +185,7 @@ DefaultArtifact profiler = new DefaultArtifact(mrid, rmr.getPublicationDate(), "nanning-profiler", "jar", "jar"); DefaultArtifact trace = new DefaultArtifact(mrid, rmr.getPublicationDate(), "nanning-trace", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {profiler, trace}, _data.getIvy(), _cache); + DownloadReport report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings, _cache)); assertNotNull(report); assertEquals(2, report.getArtifactsReports().length); @@ -195,7 +203,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {profiler, trace}, _data.getIvy(), _cache); + report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings, _cache)); assertNotNull(report); assertEquals(2, report.getArtifactsReports().length); @@ -222,7 +230,7 @@ IBiblioResolver resolver = new IBiblioResolver(); resolver.setRoot(ibiblioRoot); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertNull(resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("unknown", "unknown", "1.0"), false), _data)); } Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java Wed Jan 31 03:00:29 2007 @@ -22,7 +22,8 @@ import junit.framework.TestCase; -import org.apache.ivy.Ivy; +import org.apache.ivy.core.cache.CacheManager; +import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.DefaultArtifact; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; @@ -30,12 +31,15 @@ import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.core.report.DownloadReport; import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.DownloadOptions; import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolveEngine; import org.apache.ivy.core.resolve.ResolvedModuleRevision; import org.apache.ivy.core.search.ModuleEntry; import org.apache.ivy.core.search.OrganisationEntry; import org.apache.ivy.core.search.RevisionEntry; -import org.apache.ivy.plugins.resolver.IvyRepResolver; +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; @@ -46,15 +50,21 @@ public class IvyRepResolverTest extends TestCase { // remote.test - private File _cache; + private IvySettings _settings; + private ResolveEngine _engine; private ResolveData _data; - private Ivy _ivy; + private File _cache; + private CacheManager _cacheManager; + protected void setUp() throws Exception { + _settings = new IvySettings(); + _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); _cache = new File("build/cache"); - _ivy = new Ivy(); - _data = new ResolveData(_ivy, _cache, null, null, false); + _data = new ResolveData(_engine, _cache, null, null, true); _cache.mkdirs(); + _cacheManager = new CacheManager(_settings, _cache); + _settings.setDefaultCache(_cache); } protected void tearDown() throws Exception { @@ -66,12 +76,11 @@ public void testDefaults() { IvyRepResolver resolver = new IvyRepResolver(); - Ivy ivy = new Ivy(); - ivy.setVariable("ivy.ivyrep.default.ivy.root", "http://www.jayasoft.fr/myivyrep/";); - ivy.setVariable("ivy.ivyrep.default.ivy.pattern", "[organisation]/[module]/ivy-[revision].[ext]"); - ivy.setVariable("ivy.ivyrep.default.artifact.root", "http://www.ibiblio.org/mymaven/";); - ivy.setVariable("ivy.ivyrep.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); - resolver.setIvy(ivy); + _settings.setVariable("ivy.ivyrep.default.ivy.root", "http://www.jayasoft.fr/myivyrep/";); + _settings.setVariable("ivy.ivyrep.default.ivy.pattern", "[organisation]/[module]/ivy-[revision].[ext]"); + _settings.setVariable("ivy.ivyrep.default.artifact.root", "http://www.ibiblio.org/mymaven/";); + _settings.setVariable("ivy.ivyrep.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); + resolver.setSettings(_settings); List l = resolver.getIvyPatterns(); assertNotNull(l); assertEquals(1, l.size()); @@ -85,7 +94,7 @@ public void testIvyRep() throws Exception { IvyRepResolver resolver = new IvyRepResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); assertEquals("test", resolver.getName()); ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-cli", "1.0"); @@ -95,7 +104,7 @@ assertEquals(2, rmr.getDescriptor().getDependencies().length); DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "commons-cli", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -107,7 +116,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -129,7 +138,7 @@ resolver.setName("testLocal"); resolver.setIvyroot("file:" + rootpath); resolver.setIvypattern("[organisation]/[module]/ivys/ivy-[revision].xml"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); @@ -139,7 +148,7 @@ public void testListing() { IvyRepResolver resolver = new IvyRepResolver(); resolver.setName("test"); - resolver.setIvy(_ivy); + resolver.setSettings(_settings); OrganisationEntry[] orgs = resolver.listOrganisations(); ResolverTestHelper.assertOrganisationEntriesContains(resolver, new String[] {"hibernate", "apache"}, orgs); Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java Wed Jan 31 03:00:29 2007 @@ -25,17 +25,15 @@ import java.util.Date; import java.util.List; -import org.apache.ivy.Ivy; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; import org.apache.ivy.core.module.descriptor.DependencyDescriptor; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.resolve.DownloadOptions; import org.apache.ivy.core.resolve.ResolveData; import org.apache.ivy.core.resolve.ResolvedModuleRevision; -import org.apache.ivy.plugins.resolver.AbstractResolver; -import org.apache.ivy.plugins.resolver.DependencyResolver; @@ -93,7 +91,7 @@ return rmr; } - public DownloadReport download(Artifact[] artifacts, Ivy ivy, File cache, boolean useOrigin) { + public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { return null; } public void publish(Artifact artifact, File src, boolean overwrite) throws IOException { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java Wed Jan 31 03:00:29 2007 @@ -17,12 +17,11 @@ */ package org.apache.ivy.plugins.resolver; +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 org.apache.ivy.plugins.resolver.DependencyResolver; - -import junit.framework.Assert; /** * Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java Wed Jan 31 03:00:29 2007 @@ -23,7 +23,8 @@ import junit.framework.TestCase; -import org.apache.ivy.Ivy; +import org.apache.ivy.core.cache.CacheManager; +import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.DefaultArtifact; import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor; @@ -32,10 +33,13 @@ import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.core.report.DownloadReport; import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.DownloadOptions; import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolveEngine; 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.ivy.plugins.resolver.URLResolver; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; @@ -46,14 +50,21 @@ */ public class URLResolverTest extends TestCase { // remote.test - private File _cache; + private IvySettings _ivy; + private ResolveEngine _engine; private ResolveData _data; - private Ivy _ivy = new Ivy(); + private File _cache; + private CacheManager _cacheManager; + protected void setUp() throws Exception { + _ivy = new IvySettings(); + _engine = new ResolveEngine(_ivy, new EventManager(), new SortEngine(_ivy)); _cache = new File("build/cache"); - _data = new ResolveData(_ivy, _cache, null, null, true); + _data = new ResolveData(_engine, _cache, null, null, true); _cache.mkdirs(); + _cacheManager = new CacheManager(_ivy, _cache); + _ivy.setDefaultCache(_cache); } protected void tearDown() throws Exception { @@ -65,7 +76,7 @@ public void testFile() throws Exception { URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); String rootpath = new File("test/repositories/1").getAbsolutePath(); resolver.addIvyPattern("file:"+rootpath + "/[organisation]/[module]/ivys/ivy-[revision].xml"); resolver.addArtifactPattern("file:"+rootpath + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); @@ -83,7 +94,7 @@ // test to ask to download DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_ivy, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -95,7 +106,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_ivy, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -109,7 +120,7 @@ public void testLatestFile() throws Exception { URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); String rootpath = new File("test/repositories/1").getAbsolutePath().replaceAll("\\\\", "/"); resolver.addIvyPattern("file:"+rootpath + "/[organisation]/[module]/ivys/ivy-[revision].xml"); resolver.addArtifactPattern("file:"+rootpath + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); @@ -132,7 +143,7 @@ } URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); @@ -143,7 +154,7 @@ assertEquals(mrid, rmr.getId()); DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "commons-fileupload", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_ivy, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -155,7 +166,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_ivy, _cache)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -174,7 +185,7 @@ } URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); @@ -189,7 +200,7 @@ DefaultArtifact profiler = new DefaultArtifact(mrid, rmr.getPublicationDate(), "nanning-profiler", "jar", "jar"); DefaultArtifact trace = new DefaultArtifact(mrid, rmr.getPublicationDate(), "nanning-trace", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {profiler, trace}, _data.getIvy(), _cache); + DownloadReport report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_ivy, _cache)); assertNotNull(report); assertEquals(2, report.getArtifactsReports().length); @@ -207,7 +218,7 @@ assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {profiler, trace}, _data.getIvy(), _cache); + report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_ivy, _cache)); assertNotNull(report); assertEquals(2, report.getArtifactsReports().length); @@ -232,7 +243,7 @@ } URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); @@ -250,7 +261,7 @@ } URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); resolver.addIvyPattern(ibiblioRoot+"/[module]/ivys/ivy-[revision].xml"); resolver.addArtifactPattern(ibiblioRoot+"/maven/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); @@ -260,7 +271,7 @@ public void testDownloadWithUseOriginIsTrue() throws Exception { URLResolver resolver = new URLResolver(); - resolver.setIvy(_ivy); + resolver.setSettings(_ivy); String rootpath = new File("test/repositories/1").getAbsolutePath(); resolver.addIvyPattern("file:"+rootpath + "/[organisation]/[module]/ivys/ivy-[revision].xml"); resolver.addArtifactPattern("file:"+rootpath + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); @@ -278,7 +289,7 @@ // test to ask to download DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache, true); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_ivy, new CacheManager(_ivy, _cache), null, true)); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java Wed Jan 31 03:00:29 2007 @@ -17,8 +17,6 @@ */ package org.apache.ivy.plugins.resolver; -import org.apache.ivy.plugins.resolver.VfsResolver; - import junit.framework.TestCase; public class VfsResolverTest extends TestCase { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java Wed Jan 31 03:00:29 2007 @@ -18,7 +18,6 @@ package org.apache.ivy.plugins.version; import org.apache.ivy.core.module.id.ModuleRevisionId; -import org.apache.ivy.plugins.version.AbstractVersionMatcher; public class MockVersionMatcher extends AbstractVersionMatcher { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java Wed Jan 31 03:00:29 2007 @@ -17,12 +17,10 @@ */ 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 org.apache.ivy.plugins.version.VersionMatcher; -import org.apache.ivy.plugins.version.VersionRangeMatcher; - -import junit.framework.TestCase; public class VersionRangeMatcherTest extends TestCase { VersionMatcher _vm = new VersionRangeMatcher("range", new LatestRevisionStrategy()); Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java Wed Jan 31 03:00:29 2007 @@ -20,9 +20,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ivy.util.Configurator; - - import junit.framework.TestCase; /** Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java Wed Jan 31 03:00:29 2007 @@ -20,9 +20,9 @@ import java.util.HashMap; import java.util.Map; -import org.apache.ivy.core.IvyPatternHelper; - import junit.framework.TestCase; + +import org.apache.ivy.core.IvyPatternHelper; public class IvyPatternHelperTest extends TestCase { public void testSubstitute() { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java Wed Jan 31 03:00:29 2007 @@ -17,8 +17,6 @@ */ package org.apache.ivy.util; -import org.apache.ivy.util.StringUtils; - import junit.framework.TestCase; public class StringUtilsTest extends TestCase { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java Wed Jan 31 03:00:29 2007 @@ -17,13 +17,11 @@ */ package org.apache.ivy.util.url; -import junit.framework.TestCase; - import java.net.URL; import java.util.Iterator; import java.util.List; -import org.apache.ivy.util.url.ApacheURLLister; +import junit.framework.TestCase; /** Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java Wed Jan 31 03:00:29 2007 @@ -20,9 +20,6 @@ import java.io.File; import java.net.URL; -import org.apache.ivy.util.url.BasicURLHandler; -import org.apache.ivy.util.url.URLHandler; - import junit.framework.TestCase; /** Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java?view=diff&rev=501796&r1=501795&r2=501796 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java Wed Jan 31 03:00:29 2007 @@ -19,9 +19,6 @@ import java.net.URL; -import org.apache.ivy.util.url.HttpClientHandler; -import org.apache.ivy.util.url.URLHandler; - import junit.framework.TestCase; /**
