Repository: ant-ivy Updated Branches: refs/heads/master 545536e34 -> 225afb8ba
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java index f64255f..ecbed50 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java @@ -57,7 +57,7 @@ public class VfsTestHelper { // setup and initialize VFS fsManager = new StandardFileSystemManager() { protected void configurePlugins() throws FileSystemException { - // disable automatic loading potential unsupported extensions + // disable automatic loading of potentially unsupported extensions } }; fsManager.setConfiguration(getClass().getResource(VFS_CONF).toString()); @@ -75,10 +75,10 @@ public class VfsTestHelper { * name of the resource * @return <class>List</class> of well-formed VFS resource identifiers */ - public List createVFSUriSet(String resource) { - List set = new ArrayList(); - for (int i = 0; i < VfsURI.SUPPORTED_SCHEMES.length; i++) { - set.add(VfsURI.vfsURIFactory(VfsURI.SUPPORTED_SCHEMES[i], resource, ivy)); + public List<VfsURI> createVFSUriSet(String resource) { + List<VfsURI> set = new ArrayList<VfsURI>(); + for (String scheme : VfsURI.SUPPORTED_SCHEMES) { + set.add(VfsURI.vfsURIFactory(scheme, resource, ivy)); } return set; } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/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 7f03298..28d04f6 100644 --- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java @@ -158,8 +158,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { assertNotNull(rmr); assertEquals("3", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); - for (int i = 0; i < resolvers.length; i++) { - assertEquals(ddAsList, resolvers[i].askedDeps); + for (MockResolver resolver : resolvers) { + assertEquals(ddAsList, resolver.askedDeps); } } @@ -198,8 +198,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); - for (int i = 0; i < resolvers.length; i++) { - assertEquals(ddAsList, resolvers[i].askedDeps); + for (MockResolver resolver : resolvers) { + assertEquals(ddAsList, resolver.askedDeps); } } @@ -282,8 +282,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); - for (int i = 0; i < resolvers.length; i++) { - assertEquals(ddAsList, resolvers[i].askedDeps); + for (MockResolver resolver : resolvers) { + assertEquals(ddAsList, resolver.askedDeps); } } @@ -375,8 +375,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { chain.setSettings(settings); MockResolver[] resolvers = new MockResolver[] {MockResolver.buildMockResolver(settings, "1", true, null)}; - for (int i = 0; i < resolvers.length; i++) { - chain.add(resolvers[i]); + for (MockResolver resolver : resolvers) { + chain.add(resolver); } chain.getDependency(dd, data); // should not have asked any dependency, should have hit the cache http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/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 79cfe61..743ff02 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java @@ -230,8 +230,8 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { Map[] valuesMaps = resolver.listTokenValues(new String[] {IvyPatternHelper.MODULE_KEY}, otherTokenValues); Set vals = new HashSet(); - for (int i = 0; i < valuesMaps.length; i++) { - vals.add(valuesMaps[i].get(IvyPatternHelper.MODULE_KEY)); + for (Map valuesMap : valuesMaps) { + vals.add(valuesMap.get(IvyPatternHelper.MODULE_KEY)); } values = (String[]) vals.toArray(new String[vals.size()]); assertEquals(1, values.length); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java index 3af35e6..6ab2543 100644 --- a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java +++ b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java @@ -18,7 +18,6 @@ package org.apache.ivy.util.url; import java.net.URL; -import java.util.Iterator; import java.util.List; import org.junit.Test; @@ -40,23 +39,22 @@ public class ApacheURLListerTest { public void testRetrieveListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List files = lister.retrieveListing( + List<URL> 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(); + for (URL file : files) { assertTrue("found a non matching file: " + file, file.getPath().matches(".*/[^/]+\\.(jar|md5|sha1)")); } // try a directory listing - List dirs = lister.retrieveListing( + List<URL> dirs = lister.retrieveListing( ApacheURLListerTest.class.getResource("apache-dir-listing.html"), false, true); assertNotNull(dirs); assertEquals(4, dirs.size()); - List empty = lister.retrieveListing( + List<URL> empty = lister.retrieveListing( ApacheURLListerTest.class.getResource("apache-dir-listing.html"), true, false); assertTrue(empty.isEmpty()); } @@ -70,7 +68,7 @@ public class ApacheURLListerTest { public void testRetrieveListingWithSpaces() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List files = lister.retrieveListing( + List<URL> files = lister.retrieveListing( ApacheURLListerTest.class.getResource("listing-with-spaces.html"), true, false); assertNotNull(files); assertTrue(files.size() > 0); @@ -80,7 +78,7 @@ public class ApacheURLListerTest { public void testRetrieveArtifactoryListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List files = lister.retrieveListing( + List<URL> files = lister.retrieveListing( ApacheURLListerTest.class.getResource("artifactory-dir-listing.html"), true, true); assertNotNull(files); assertEquals(1, files.size()); @@ -90,7 +88,7 @@ public class ApacheURLListerTest { public void testRetrieveArchivaListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List d = lister.listDirectories(ApacheURLListerTest.class + List<URL> d = lister.listDirectories(ApacheURLListerTest.class .getResource("archiva-listing.html")); assertNotNull(d); // archiva listing is not valid html at all currently (1.0, unclosed a tags), @@ -102,7 +100,7 @@ public class ApacheURLListerTest { public void testRetrieveFixedArchivaListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List d = lister.listDirectories(ApacheURLListerTest.class + List<URL> d = lister.listDirectories(ApacheURLListerTest.class .getResource("fixed-archiva-listing.html")); assertNotNull(d); assertEquals(3, d.size()); @@ -112,7 +110,7 @@ public class ApacheURLListerTest { public void testRetrieveMavenProxyListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); - List d = lister.listDirectories(ApacheURLListerTest.class + List<URL> d = lister.listDirectories(ApacheURLListerTest.class .getResource("maven-proxy-listing.html")); assertNotNull(d); assertEquals(3, d.size());
