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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -27,7 +27,6 @@ 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; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; import org.apache.ivy.core.module.descriptor.DefaultIncludeRule; import org.apache.ivy.core.module.id.ArtifactId; @@ -46,75 +45,80 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; - /** * Tests URLResolver. Http tests are based upon ibiblio site. - * */ public class URLResolverTest extends TestCase { - // remote.test + // remote.test private IvySettings _settings; + private ResolveEngine _engine; + private ResolveData _data; + private File _cache; - - + protected void setUp() throws Exception { - _settings = new IvySettings(); + _settings = new IvySettings(); _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); _cache = new File("build/cache"); - _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(_settings, _cache))); + _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance( + _settings, _cache))); _cache.mkdirs(); _settings.setDefaultCache(_cache); } - + protected void tearDown() throws Exception { Delete del = new Delete(); del.setProject(new Project()); del.setDir(_cache); del.execute(); } - + public void testFile() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); 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]"); + resolver.addIvyPattern("file:" + rootpath + + "/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern("file:" + rootpath + + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"); - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); + ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, + false), _data); assertNotNull(rmr); - + assertEquals(mrid, rmr.getId()); Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime(); assertEquals(pubdate, rmr.getPublicationDate()); - - + // test to ask to download DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions( + _settings, _cache)); assertNotNull(report); - + assertEquals(1, report.getArtifactsReports().length); - + ArtifactDownloadReport ar = report.getArtifactReport(artifact); assertNotNull(ar); - + assertEquals(artifact, ar.getArtifact()); assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); + report = resolver.download(new Artifact[] {artifact}, + new DownloadOptions(_settings, _cache)); assertNotNull(report); - + assertEquals(1, report.getArtifactsReports().length); - + ar = report.getArtifactReport(artifact); assertNotNull(ar); - + assertEquals(artifact, ar.getArtifact()); assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } @@ -123,15 +127,19 @@ URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); 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]"); + resolver.addIvyPattern("file:" + rootpath + + "/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern("file:" + rootpath + + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "2.0"); - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1", "latest.integration"), false), _data); + ResolvedModuleRevision rmr = resolver + .getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", + "mod1.1", "latest.integration"), false), _data); assertNotNull(rmr); - + assertEquals(mrid, rmr.getId()); Date pubdate = new GregorianCalendar(2005, 1, 15, 11, 0, 0).getTime(); assertEquals(pubdate, rmr.getPublicationDate()); @@ -142,39 +150,43 @@ if (ibiblioRoot == null) { return; } - + URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); - resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-fileupload", "1.0"); - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); + ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, + false), _data); assertNotNull(rmr); assertEquals(mrid, rmr.getId()); - DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "commons-fileupload", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); + DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), + "commons-fileupload", "jar", "jar"); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions( + _settings, _cache)); assertNotNull(report); - + assertEquals(1, report.getArtifactsReports().length); - + ArtifactDownloadReport ar = report.getArtifactReport(artifact); assertNotNull(ar); - + assertEquals(artifact, ar.getArtifact()); assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache)); + report = resolver.download(new Artifact[] {artifact}, + new DownloadOptions(_settings, _cache)); assertNotNull(report); - + assertEquals(1, report.getArtifactsReports().length); - + ar = report.getArtifactReport(artifact); assertNotNull(ar); - + assertEquals(artifact, ar.getArtifact()); assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } @@ -184,55 +196,61 @@ if (ibiblioRoot == null) { return; } - + URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); - resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "nanning", "0.9"); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(mrid, false); - dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), "nanning-profiler", "jar", "jar"), ExactPatternMatcher.INSTANCE, null)); - dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), "nanning-trace", "jar", "jar"), ExactPatternMatcher.INSTANCE, null)); + dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), + "nanning-profiler", "jar", "jar"), ExactPatternMatcher.INSTANCE, null)); + dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), + "nanning-trace", "jar", "jar"), ExactPatternMatcher.INSTANCE, null)); ResolvedModuleRevision rmr = resolver.getDependency(dd, _data); assertNotNull(rmr); assertEquals(mrid, rmr.getId()); - 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}, new DownloadOptions(_settings, _cache)); + 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}, + new DownloadOptions(_settings, _cache)); assertNotNull(report); - + assertEquals(2, report.getArtifactsReports().length); - + ArtifactDownloadReport ar = report.getArtifactReport(profiler); assertNotNull(ar); - + assertEquals(profiler, ar.getArtifact()); assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); ar = report.getArtifactReport(trace); assertNotNull(ar); - + assertEquals(trace, ar.getArtifact()); assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings, _cache)); + report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings, + _cache)); assertNotNull(report); - + assertEquals(2, report.getArtifactsReports().length); - + ar = report.getArtifactReport(profiler); assertNotNull(ar); - + assertEquals(profiler, ar.getArtifact()); assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); ar = report.getArtifactReport(trace); assertNotNull(ar); - + assertEquals(trace, ar.getArtifact()); assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } @@ -242,15 +260,16 @@ if (ibiblioRoot == null) { return; } - + URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); - resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("objectweb", "asm", "1.4+"); - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); + ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, + false), _data); assertNotNull(rmr); assertEquals("1.4.3", rmr.getId().getRevision()); } @@ -260,17 +279,18 @@ if (ibiblioRoot == null) { return; } - + URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); resolver.setAlwaysCheckExactRevision(true); - resolver.addIvyPattern(ibiblioRoot+"/[module]/poms/[module]-[revision].pom"); - resolver.addArtifactPattern(ibiblioRoot+"/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addIvyPattern(ibiblioRoot + "/[module]/poms/[module]-[revision].pom"); + resolver.addArtifactPattern(ibiblioRoot + "/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("asm", "asm", "[1.4,1.5]"); - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); + ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, + false), _data); assertNotNull(rmr); assertEquals("1.4.4", rmr.getId().getRevision()); } @@ -280,58 +300,63 @@ if (ibiblioRoot == null) { return; } - + URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); - resolver.addIvyPattern(ibiblioRoot+"/[module]/ivys/ivy-[revision].xml"); - resolver.addArtifactPattern(ibiblioRoot+"/maven/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addIvyPattern(ibiblioRoot + "/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern(ibiblioRoot + + "/maven/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); - assertNull(resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("unknown", "unknown", "1.0"), false), _data)); + assertNull(resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId + .newInstance("unknown", "unknown", "1.0"), false), _data)); } public void testDownloadWithUseOriginIsTrue() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(_settings); 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]"); + resolver.addIvyPattern("file:" + rootpath + + "/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern("file:" + rootpath + + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); - + ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"); - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); + ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, + false), _data); assertNotNull(rmr); - + assertEquals(mrid, rmr.getId()); Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime(); assertEquals(pubdate, rmr.getPublicationDate()); - - + // test to ask to download DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar"); - DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, new CacheManager(_settings, _cache), null, true)); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions( + _settings, new CacheManager(_settings, _cache), null, true)); assertNotNull(report); - + assertEquals(1, report.getArtifactsReports().length); - + ArtifactDownloadReport ar = report.getArtifactReport(artifact); assertNotNull(ar); - + assertEquals(artifact, ar.getArtifact()); assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache -// report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); -// assertNotNull(report); -// -// assertEquals(1, report.getArtifactsReports().length); -// -// ar = report.getArtifactReport(artifact); -// assertNotNull(ar); -// -// assertEquals(artifact, ar.getArtifact()); -// assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); -// + // report = resolver.download(new Artifact[] {artifact}, _data.getIvy(), _cache); + // assertNotNull(report); + // + // assertEquals(1, report.getArtifactsReports().length); + // + // ar = report.getArtifactReport(artifact); + // assertNotNull(ar); + // + // assertEquals(artifact, ar.getArtifact()); + // assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); + // } }
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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -20,21 +20,21 @@ import junit.framework.TestCase; public class VfsResolverTest extends TestCase { - VfsResolver resolver = null; - - public void setUp() { - resolver = new VfsResolver(); - } - - public void tearDown() { - resolver = null; - } - - public void testInit() { - assertEquals(resolver.getClass(), VfsResolver.class); - } - - public void testTypeName() { - assertEquals(resolver.getTypeName(), "vfs"); - } + VfsResolver resolver = null; + + public void setUp() { + resolver = new VfsResolver(); + } + + public void tearDown() { + resolver = null; + } + + public void testInit() { + assertEquals(resolver.getClass(), VfsResolver.class); + } + + public void testTypeName() { + assertEquals(resolver.getTypeName(), "vfs"); + } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -21,15 +21,15 @@ public class MockVersionMatcher extends AbstractVersionMatcher { - public MockVersionMatcher() { - } + public MockVersionMatcher() { + } - public boolean isDynamic(ModuleRevisionId askedMrid) { - return false; - } + public boolean isDynamic(ModuleRevisionId askedMrid) { + return false; + } - public boolean accept(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid) { - return false; - } + public boolean accept(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid) { + return false; + } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -23,90 +23,88 @@ import org.apache.ivy.plugins.latest.LatestRevisionStrategy; public class VersionRangeMatcherTest extends TestCase { - VersionMatcher _vm = new VersionRangeMatcher("range", new LatestRevisionStrategy()); - - public VersionRangeMatcherTest() { - } - - public void testDynamic() { - assertDynamic("lastest.integration", false); - assertDynamic("[1.0]", false); - assertDynamic("(1.0)", false); - assertDynamic("(1.0,2.0)", false); - assertDynamic("[1.0;2.0]", false); - - assertDynamic("[1.0,2.0]", true); - assertDynamic("[1.0,2.0[", true); - assertDynamic("]1.0,2.0[", true); - assertDynamic("]1.0,2.0]", true); - assertDynamic("[1.0,)", true); - assertDynamic("(,1.0]", true); - } - - public void testIncludingFinite() { - assertAccept("[1.0,2.0]", "1.1", true); - assertAccept("[1.0,2.0]", "0.9", false); - assertAccept("[1.0,2.0]", "2.1", false); - assertAccept("[1.0,2.0]", "1.0", true); - assertAccept("[1.0,2.0]", "2.0", true); - } - - public void testExcludingFinite() { - assertAccept("]1.0,2.0[", "1.1", true); - assertAccept("]1.0,2.0[", "0.9", false); - assertAccept("]1.0,2.0[", "2.1", false); - - assertAccept("]1.0,2.0]", "1.0", false); - assertAccept("]1.0,2.0[", "1.0", false); - assertAccept("[1.0,2.0[", "1.0", true); - - assertAccept("[1.0,2.0[", "2.0", false); - assertAccept("]1.0,2.0[", "2.0", false); - assertAccept("]1.0,2.0]", "2.0", true); - } - - public void testIncludingInfinite() { - assertAccept("[1.0,)", "1.1", true); - assertAccept("[1.0,)", "2.0", true); - assertAccept("[1.0,)", "3.5.6", true); - assertAccept("[1.0,)", "1.0", true); - - assertAccept("[1.0,)", "0.9", false); - - assertAccept("(,2.0]", "1.1", true); - assertAccept("(,2.0]", "0.1", true); - assertAccept("(,2.0]", "0.2.4", true); - assertAccept("(,2.0]", "2.0", true); - - assertAccept("(,2.0]", "2.3", false); - } - - public void testExcludingInfinite() { - assertAccept("]1.0,)", "1.1", true); - assertAccept("]1.0,)", "2.0", true); - assertAccept("]1.0,)", "3.5.6", true); - - assertAccept("]1.0,)", "1.0", false); - assertAccept("]1.0,)", "0.9", false); - - assertAccept("(,2.0[", "1.1", true); - assertAccept("(,2.0[", "0.1", true); - assertAccept("(,2.0[", "0.2.4", true); - - assertAccept("(,2.0[", "2.0", false); - assertAccept("(,2.0[", "2.3", false); - } - - - // assertion helper methods - - private void assertDynamic(String askedVersion, boolean b) { - assertEquals(b, _vm.isDynamic(ModuleRevisionId.newInstance("org", "name", askedVersion))); - } - - private void assertAccept(String askedVersion, String depVersion, boolean b) { - assertEquals(b, _vm.accept( - ModuleRevisionId.newInstance("org", "name", askedVersion), - ModuleRevisionId.newInstance("org", "name", depVersion))); - } + VersionMatcher _vm = new VersionRangeMatcher("range", new LatestRevisionStrategy()); + + public VersionRangeMatcherTest() { + } + + public void testDynamic() { + assertDynamic("lastest.integration", false); + assertDynamic("[1.0]", false); + assertDynamic("(1.0)", false); + assertDynamic("(1.0,2.0)", false); + assertDynamic("[1.0;2.0]", false); + + assertDynamic("[1.0,2.0]", true); + assertDynamic("[1.0,2.0[", true); + assertDynamic("]1.0,2.0[", true); + assertDynamic("]1.0,2.0]", true); + assertDynamic("[1.0,)", true); + assertDynamic("(,1.0]", true); + } + + public void testIncludingFinite() { + assertAccept("[1.0,2.0]", "1.1", true); + assertAccept("[1.0,2.0]", "0.9", false); + assertAccept("[1.0,2.0]", "2.1", false); + assertAccept("[1.0,2.0]", "1.0", true); + assertAccept("[1.0,2.0]", "2.0", true); + } + + public void testExcludingFinite() { + assertAccept("]1.0,2.0[", "1.1", true); + assertAccept("]1.0,2.0[", "0.9", false); + assertAccept("]1.0,2.0[", "2.1", false); + + assertAccept("]1.0,2.0]", "1.0", false); + assertAccept("]1.0,2.0[", "1.0", false); + assertAccept("[1.0,2.0[", "1.0", true); + + assertAccept("[1.0,2.0[", "2.0", false); + assertAccept("]1.0,2.0[", "2.0", false); + assertAccept("]1.0,2.0]", "2.0", true); + } + + public void testIncludingInfinite() { + assertAccept("[1.0,)", "1.1", true); + assertAccept("[1.0,)", "2.0", true); + assertAccept("[1.0,)", "3.5.6", true); + assertAccept("[1.0,)", "1.0", true); + + assertAccept("[1.0,)", "0.9", false); + + assertAccept("(,2.0]", "1.1", true); + assertAccept("(,2.0]", "0.1", true); + assertAccept("(,2.0]", "0.2.4", true); + assertAccept("(,2.0]", "2.0", true); + + assertAccept("(,2.0]", "2.3", false); + } + + public void testExcludingInfinite() { + assertAccept("]1.0,)", "1.1", true); + assertAccept("]1.0,)", "2.0", true); + assertAccept("]1.0,)", "3.5.6", true); + + assertAccept("]1.0,)", "1.0", false); + assertAccept("]1.0,)", "0.9", false); + + assertAccept("(,2.0[", "1.1", true); + assertAccept("(,2.0[", "0.1", true); + assertAccept("(,2.0[", "0.2.4", true); + + assertAccept("(,2.0[", "2.0", false); + assertAccept("(,2.0[", "2.3", false); + } + + // assertion helper methods + + private void assertDynamic(String askedVersion, boolean b) { + assertEquals(b, _vm.isDynamic(ModuleRevisionId.newInstance("org", "name", askedVersion))); + } + + private void assertAccept(String askedVersion, String depVersion, boolean b) { + assertEquals(b, _vm.accept(ModuleRevisionId.newInstance("org", "name", askedVersion), + ModuleRevisionId.newInstance("org", "name", depVersion))); + } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -26,143 +26,169 @@ * */ public class ConfiguratorTest extends TestCase { - public static class City { + public static class City { private List _housings = new ArrayList(); + private List _streets = new ArrayList(); - private String _name; - public String getName() { - return _name; - } - public void setName(String name) { - _name = name; - } - public List getHousings() { - return _housings; - } - public List getStreets() { - return _streets; - } + private String _name; + + public String getName() { + return _name; + } + + public void setName(String name) { + _name = name; + } + + public List getHousings() { + return _housings; + } + + public List getStreets() { + return _streets; + } + public void add(Housing h) { _housings.add(h); } + public void add(Street s) { _streets.add(s); } } - public static class Street { - private Class _clazz; - private List _trees = new ArrayList(); - public List getTrees() { - return _trees; - } - public void addConfiguredTree(Tree tree) { - _trees.add(tree); - } - public Class getClazz() { - return _clazz; - } - public void setClazz(Class clazz) { - _clazz = clazz; - } + public static class Street { + private Class _clazz; + + private List _trees = new ArrayList(); + + public List getTrees() { + return _trees; + } + + public void addConfiguredTree(Tree tree) { + _trees.add(tree); + } + + public Class getClazz() { + return _clazz; + } + + public void setClazz(Class clazz) { + _clazz = clazz; + } } - public static abstract class Housing { + public static abstract class Housing { private List _rooms = new ArrayList(); + private boolean _isEmpty; + private Person _proprietary; - public List getRooms() { - return _rooms; - } + public List getRooms() { + return _rooms; + } + public void addRoom(Room r) { _rooms.add(r); } - public boolean isEmpty() { - return _isEmpty; - } - public void setEmpty(boolean isEmpty) { - _isEmpty = isEmpty; - } - public Person getProprietary() { - return _proprietary; - } - public void setProprietary(Person proprietary) { - _proprietary = proprietary; - } - } - - public static class House extends Housing { - } - - public static class Tree { - private short _age; - public short getAge() { - return _age; - } - public void setAge(short age) { - _age = age; - } - } - - public static class Flat extends Housing { - private int _stage; - public int getStage() { - return _stage; - } - public void setStage(int stage) { - _stage = stage; - } - } - - public static class Room { - private short _surface; - public short getSurface() { - return _surface; - } - public void setSurface(short surface) { - _surface = surface; - } - } - - public static class Person { - private String _name; - - public Person(String name) { - _name = name; - } - public String getName() { - return _name; - } + + public boolean isEmpty() { + return _isEmpty; + } + + public void setEmpty(boolean isEmpty) { + _isEmpty = isEmpty; + } + + public Person getProprietary() { + return _proprietary; + } + + public void setProprietary(Person proprietary) { + _proprietary = proprietary; + } + } + + public static class House extends Housing { + } + + public static class Tree { + private short _age; + + public short getAge() { + return _age; + } + + public void setAge(short age) { + _age = age; + } + } + + public static class Flat extends Housing { + private int _stage; + + public int getStage() { + return _stage; + } + + public void setStage(int stage) { + _stage = stage; + } + } + + public static class Room { + private short _surface; + + public short getSurface() { + return _surface; + } + + public void setSurface(short surface) { + _surface = surface; + } + } + + public static class Person { + private String _name; + + public Person(String name) { + _name = name; + } + + public String getName() { + return _name; + } } private Configurator _conf; - - protected void setUp() throws Exception { - _conf = new Configurator(); - } - - public void testSetRoot() { + + protected void setUp() throws Exception { + _conf = new Configurator(); + } + + public void testSetRoot() { City city = new City(); _conf.setRoot(city); assertEquals(city, _conf.getCurrent()); - } - + } + public void testStringAttribute() { City city = new City(); _conf.setRoot(city); _conf.setAttribute("name", "bordeaux"); assertEquals("bordeaux", city.getName()); } - + public void testIntAttribute() { Flat flat = new Flat(); _conf.setRoot(flat); _conf.setAttribute("stage", "4"); assertEquals(4, flat.getStage()); } - + public void testBooleanAttribute() { Housing housing = new House(); _conf.setRoot(housing); @@ -186,24 +212,25 @@ _conf.setAttribute("clazz", getClass().getName()); assertEquals(getClass(), street.getClazz()); } - + public void testPersonAttribute() { Housing housing = new House(); _conf.setRoot(housing); _conf.setAttribute("proprietary", "jean"); assertEquals("jean", housing.getProprietary().getName()); } - + public void testAddRoom() { Housing housing = new House(); _conf.setRoot(housing); - _conf.startCreateChild("room"); - assertEquals(1, housing.getRooms().size()); - _conf.setAttribute("surface", "24"); - assertEquals(24, ((Room)housing.getRooms().get(0)).getSurface()); - _conf.endCreateChild(); + _conf.startCreateChild("room"); + assertEquals(1, housing.getRooms().size()); + _conf.setAttribute("surface", "24"); + assertEquals(24, ((Room) housing.getRooms().get(0)).getSurface()); + _conf.endCreateChild(); assertEquals(housing, _conf.getCurrent()); } + public void testAddConfiguredTree() { Street street = new Street(); _conf.setRoot(street); @@ -212,16 +239,17 @@ _conf.setAttribute("age", "400"); _conf.endCreateChild(); assertEquals(1, street.getTrees().size()); - assertEquals(400, ((Tree)street.getTrees().get(0)).getAge()); + assertEquals(400, ((Tree) street.getTrees().get(0)).getAge()); assertEquals(street, _conf.getCurrent()); } + public void testAddWithTypeDef() throws Exception { - City city = new City(); - _conf.typeDef("house", House.class.getName()); - _conf.typeDef("flat", Flat.class.getName()); - _conf.typeDef("street", Street.class.getName()); - _conf.setRoot(city); - _conf.startCreateChild("house"); + City city = new City(); + _conf.typeDef("house", House.class.getName()); + _conf.typeDef("flat", Flat.class.getName()); + _conf.typeDef("street", Street.class.getName()); + _conf.setRoot(city); + _conf.startCreateChild("house"); assertEquals(1, city.getHousings().size()); assertTrue(city.getHousings().get(0) instanceof House); _conf.endCreateChild(); @@ -231,9 +259,10 @@ _conf.endCreateChild(); _conf.startCreateChild("street"); assertEquals(1, city.getStreets().size()); - _conf.endCreateChild(); + _conf.endCreateChild(); assertEquals(city, _conf.getCurrent()); } + public void testNested() throws Exception { City city = new City(); _conf.typeDef("house", House.class.getName()); @@ -247,15 +276,17 @@ _conf.endCreateChild(); _conf.endCreateChild(); assertEquals(city, _conf.getCurrent()); - assertEquals(2, ((Housing)city.getHousings().get(0)).getRooms().size()); - assertEquals(20, ((Room)((Housing)city.getHousings().get(0)).getRooms().get(0)).getSurface()); - assertEquals(25, ((Room)((Housing)city.getHousings().get(0)).getRooms().get(1)).getSurface()); + assertEquals(2, ((Housing) city.getHousings().get(0)).getRooms().size()); + assertEquals(20, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0)) + .getSurface()); + assertEquals(25, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1)) + .getSurface()); } - + public void testMacro() throws Exception { City city = new City(); _conf.typeDef("house", House.class.getName()); - + _conf.startMacroDef("castle"); _conf.addMacroAttribute("surface", "40"); _conf.addMacroElement("addroom", true); @@ -270,7 +301,7 @@ _conf.endCreateChild(); _conf.endCreateChild(); _conf.endMacroDef(); - + _conf.setRoot(city); _conf.startCreateChild("castle"); _conf.setAttribute("surface", "10"); @@ -283,19 +314,24 @@ _conf.endCreateChild(); _conf.endCreateChild(); _conf.endCreateChild(); - + assertEquals(city, _conf.getCurrent()); assertEquals(2, city.getHousings().size()); // first castle : 2 default rooms of 10 of surface - assertEquals(2, ((Housing)city.getHousings().get(0)).getRooms().size()); - assertEquals(10, ((Room)((Housing)city.getHousings().get(0)).getRooms().get(0)).getSurface()); - assertEquals(10, ((Room)((Housing)city.getHousings().get(0)).getRooms().get(1)).getSurface()); - + assertEquals(2, ((Housing) city.getHousings().get(0)).getRooms().size()); + assertEquals(10, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0)) + .getSurface()); + assertEquals(10, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1)) + .getSurface()); + // second castle : 2 default rooms of default surface 40, + one addroom of surface 20 - assertEquals(3, ((Housing)city.getHousings().get(1)).getRooms().size()); - assertEquals(40, ((Room)((Housing)city.getHousings().get(1)).getRooms().get(0)).getSurface()); - assertEquals(40, ((Room)((Housing)city.getHousings().get(1)).getRooms().get(1)).getSurface()); - assertEquals(20, ((Room)((Housing)city.getHousings().get(1)).getRooms().get(2)).getSurface()); + assertEquals(3, ((Housing) city.getHousings().get(1)).getRooms().size()); + assertEquals(40, ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(0)) + .getSurface()); + assertEquals(40, ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(1)) + .getSurface()); + assertEquals(20, ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(2)) + .getSurface()); } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -27,9 +27,8 @@ public class IvyPatternHelperTest extends TestCase { public void testSubstitute() { String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]"; - assertEquals( - "apache/Test/build/archives/jars/test-1.0.jar", - IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar")); + assertEquals("apache/Test/build/archives/jars/test-1.0.jar", IvyPatternHelper.substitute( + pattern, "apache", "Test", "1.0", "test", "jar", "jar")); } public void testCyclicSubstitute() { @@ -43,7 +42,7 @@ } catch (Exception ex) { // ok } catch (Error er) { - fail("cyclic var shouldn't raise an error: "+er); + fail("cyclic var shouldn't raise an error: " + er); } } @@ -51,16 +50,17 @@ Map tokens = new HashMap(); tokens.put("token", ""); tokens.put("othertoken", "myval"); - assertEquals("test-myval", IvyPatternHelper.substituteTokens("test(-[token])(-[othertoken])", tokens)); + assertEquals("test-myval", IvyPatternHelper.substituteTokens( + "test(-[token])(-[othertoken])", tokens)); tokens.put("token", "val"); - assertEquals("test-val-myval", IvyPatternHelper.substituteTokens("test(-[token])(-[othertoken])", tokens)); + assertEquals("test-val-myval", IvyPatternHelper.substituteTokens( + "test(-[token])(-[othertoken])", tokens)); } public void testOrganization() { String pattern = "[organization]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]"; - assertEquals( - "apache/Test/build/archives/jars/test-1.0.jar", - IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar")); + assertEquals("apache/Test/build/archives/jars/test-1.0.jar", IvyPatternHelper.substitute( + pattern, "apache", "Test", "1.0", "test", "jar", "jar")); } } Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/MockMessageImpl.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/MockMessageImpl.java?view=diff&rev=544459&r1=544458&r2=544459 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/MockMessageImpl.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/MockMessageImpl.java Tue Jun 5 05:02:27 2007 @@ -25,83 +25,86 @@ public class MockMessageImpl implements MessageImpl { - private List _endProgress = new ArrayList(); - private List _logs = new ArrayList(); - private List _rawLogs = new ArrayList(); - private int _progressCalls; - - public void endProgress(String msg) { - _endProgress .add(msg); - } - - public void log(String msg, int level) { - _logs.add(level+" "+msg); - } - - public void progress() { - _progressCalls++; - } - - public void rawlog(String msg, int level) { - _rawLogs.add(level+" "+msg); - } - - public List getEndProgress() { - return _endProgress; - } - - public List getLogs() { - return _logs; - } - - public int getProgressCalls() { - return _progressCalls; - } - - public List getRawLogs() { - return _rawLogs; - } - - public void clear() { - _logs.clear(); - _rawLogs.clear(); - _endProgress.clear(); - _progressCalls = 0; - } - - public void assertLogContains(String message) { - for (Iterator iter = _logs.iterator(); iter.hasNext();) { - String log = (String) iter.next(); - if (log.indexOf(message) != -1) { - return; - } - } - throw new AssertionFailedError("logs do not contain expected message: expected='"+message+"' logs='\n"+join(_logs)+"'" ); - - } - - public void assertLogInfoContains(String message) { - assertLogContains(Message.MSG_INFO + " " + message); - } - - public void assertLogWarningContains(String message) { - Message.sumupProblems(); - assertLogContains(Message.MSG_WARN + " \t" + message); - } - - public void assertLogErrorContains(String message) { - Message.sumupProblems(); - assertLogContains(Message.MSG_ERR + " " + message); - } - - - private String join(List logs) { - StringBuffer sb = new StringBuffer(); - for (Iterator iter = logs.iterator(); iter.hasNext();) { - String log = (String) iter.next(); - sb.append(log).append("\n"); - } - return sb.toString(); - } + private List _endProgress = new ArrayList(); + + private List _logs = new ArrayList(); + + private List _rawLogs = new ArrayList(); + + private int _progressCalls; + + public void endProgress(String msg) { + _endProgress.add(msg); + } + + public void log(String msg, int level) { + _logs.add(level + " " + msg); + } + + public void progress() { + _progressCalls++; + } + + public void rawlog(String msg, int level) { + _rawLogs.add(level + " " + msg); + } + + public List getEndProgress() { + return _endProgress; + } + + public List getLogs() { + return _logs; + } + + public int getProgressCalls() { + return _progressCalls; + } + + public List getRawLogs() { + return _rawLogs; + } + + public void clear() { + _logs.clear(); + _rawLogs.clear(); + _endProgress.clear(); + _progressCalls = 0; + } + + public void assertLogContains(String message) { + for (Iterator iter = _logs.iterator(); iter.hasNext();) { + String log = (String) iter.next(); + if (log.indexOf(message) != -1) { + return; + } + } + throw new AssertionFailedError("logs do not contain expected message: expected='" + message + + "' logs='\n" + join(_logs) + "'"); + + } + + public void assertLogInfoContains(String message) { + assertLogContains(Message.MSG_INFO + " " + message); + } + + public void assertLogWarningContains(String message) { + Message.sumupProblems(); + assertLogContains(Message.MSG_WARN + " \t" + message); + } + + public void assertLogErrorContains(String message) { + Message.sumupProblems(); + assertLogContains(Message.MSG_ERR + " " + message); + } + + private String join(List logs) { + StringBuffer sb = new StringBuffer(); + for (Iterator iter = logs.iterator(); iter.hasNext();) { + String log = (String) iter.next(); + sb.append(log).append("\n"); + } + return sb.toString(); + } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -20,10 +20,12 @@ import junit.framework.TestCase; public class StringUtilsTest extends TestCase { - public void testEncryption() { - assertEquals("apache", StringUtils.decrypt(StringUtils.encrypt("apache"))); - assertEquals("yet another string with 126 digits and others :;%_-$& characters", StringUtils.decrypt(StringUtils.encrypt("yet another string with 126 digits and others :;%_-$& characters"))); - - assertFalse("apache".equals(StringUtils.encrypt("apache"))); - } + public void testEncryption() { + assertEquals("apache", StringUtils.decrypt(StringUtils.encrypt("apache"))); + assertEquals("yet another string with 126 digits and others :;%_-$& characters", + StringUtils.decrypt(StringUtils + .encrypt("yet another string with 126 digits and others :;%_-$& characters"))); + + assertFalse("apache".equals(StringUtils.encrypt("apache"))); + } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -23,49 +23,50 @@ import junit.framework.TestCase; - /** * Tests [EMAIL PROTECTED] ApacheURLLister}. - * */ public class ApacheURLListerTest extends TestCase { /** * Tests [EMAIL PROTECTED] ApacheURLLister#retrieveListing(URL, boolean, boolean)}. - * + * * @throws Exception */ public void testRetrieveListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List files = lister.retrieveListing(ApacheURLListerTest.class.getResource("apache-file-listing.html"), true, false); + List files = lister.retrieveListing(ApacheURLListerTest.class + .getResource("apache-file-listing.html"), true, false); assertNotNull(files); assertTrue(files.size() > 0); for (Iterator iter = files.iterator(); iter.hasNext();) { - URL file = (URL) iter.next(); - assertTrue("found a non matching file: "+file, file.getPath().matches(".*/[^/]+\\.(jar|md5|sha1)")); - } - + URL file = (URL) iter.next(); + assertTrue("found a non matching file: " + file, file.getPath().matches( + ".*/[^/]+\\.(jar|md5|sha1)")); + } // try a directory listing - List dirs = lister.retrieveListing(ApacheURLListerTest.class.getResource("apache-dir-listing.html"), false, true); + List dirs = lister.retrieveListing(ApacheURLListerTest.class + .getResource("apache-dir-listing.html"), false, true); assertNotNull(dirs); assertEquals(4, dirs.size()); - - List empty = lister.retrieveListing(ApacheURLListerTest.class.getResource("apache-dir-listing.html"), true, false); + List empty = lister.retrieveListing(ApacheURLListerTest.class + .getResource("apache-dir-listing.html"), true, false); assertTrue(empty.isEmpty()); } - + /** * Tests [EMAIL PROTECTED] ApacheURLLister#retrieveListing(URL, boolean, boolean)}. - * + * * @throws Exception */ public void testRetrieveListingWithSpaces() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List files = lister.retrieveListing(ApacheURLListerTest.class.getResource("listing-with-spaces.html"), true, false); + List files = lister.retrieveListing(ApacheURLListerTest.class + .getResource("listing-with-spaces.html"), true, false); assertNotNull(files); assertTrue(files.size() > 0); } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -26,17 +26,17 @@ * Test BasicURLHandler */ public class BasicURLHandlerTest extends TestCase { - // remote.test + // remote.test public void testIsReachable() throws Exception { URLHandler handler = new BasicURLHandler(); assertTrue(handler.isReachable(new URL("http://www.google.fr/";))); assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html";))); - + assertTrue(handler.isReachable(new File("build.xml").toURL())); assertFalse(handler.isReachable(new File("unknownfile.xml").toURL())); - + // to test ftp we should know of an anonymous ftp site... ! -// assertTrue(handler.isReachable(new URL("ftp://ftp.mozilla.org/pub/dir.sizes";))); + // assertTrue(handler.isReachable(new URL("ftp://ftp.mozilla.org/pub/dir.sizes";))); assertFalse(handler.isReachable(new URL("ftp://ftp.mozilla.org/unknown.file";))); } } 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=544459&r1=544458&r2=544459 ============================================================================== --- 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 Tue Jun 5 05:02:27 2007 @@ -25,7 +25,7 @@ * Test HttpClientHandler */ public class HttpclientURLHandlerTest extends TestCase { - // remote.test + // remote.test public void testIsReachable() throws Exception { URLHandler handler = new HttpClientHandler(); assertTrue(handler.isReachable(new URL("http://www.google.fr/";)));
