Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java Tue Jan 14 08:27:37 2014 @@ -46,10 +46,10 @@ import org.apache.ivy.util.FileUtil; import org.xml.sax.SAXParseException; public class XmlModuleUpdaterTest extends TestCase { - + protected void tearDown() throws Exception { super.tearDown(); - + XmlModuleDescriptorUpdater.LINE_SEPARATOR = System.getProperty("line.separator"); } @@ -63,16 +63,17 @@ public class XmlModuleUpdaterTest extend File dest = new File("build/updated-test.xml"); dest.deleteOnExit(); Map resolvedRevisions = new HashMap(); - resolvedRevisions.put(ModuleRevisionId.newInstance( - "yourorg", "yourmodule2", "branch1", "2+"), "2.5"); - resolvedRevisions.put(ModuleRevisionId.newInstance( - "yourorg", "yourmodule6", "trunk", "latest.integration"), "6.3"); - + resolvedRevisions.put( + ModuleRevisionId.newInstance("yourorg", "yourmodule2", "branch1", "2+"), "2.5"); + resolvedRevisions.put( + ModuleRevisionId.newInstance("yourorg", "yourmodule6", "trunk", "latest.integration"), + "6.3"); + Map resolvedBranches = new HashMap(); resolvedBranches.put(ModuleRevisionId.newInstance("yourorg", "yourmodule3", "3.1"), - "branch1"); - resolvedBranches.put(ModuleRevisionId.newInstance( - "yourorg", "yourmodule2", "branch1", "2+"), null); + "branch1"); + resolvedBranches.put( + ModuleRevisionId.newInstance("yourorg", "yourmodule2", "branch1", "2+"), null); GregorianCalendar cal = new GregorianCalendar(); cal.set(2005, 2, 22, 14, 32, 54); @@ -80,9 +81,10 @@ public class XmlModuleUpdaterTest extend Ivy ivy = Ivy.newInstance(); ivy.setVariable("myvar", "myconf1"); XmlModuleDescriptorUpdater.update( - XmlModuleUpdaterTest.class.getResource("test-update.xml"), dest, - getUpdateOptions(ivy.getSettings(), resolvedRevisions, - "release", "mynewrev", cal.getTime()).setResolvedBranches(resolvedBranches)); + XmlModuleUpdaterTest.class.getResource("test-update.xml"), + dest, + getUpdateOptions(ivy.getSettings(), resolvedRevisions, "release", "mynewrev", + cal.getTime()).setResolvedBranches(resolvedBranches)); assertTrue(dest.exists()); String expected = FileUtil.readEntirely(new BufferedReader(new InputStreamReader( @@ -93,9 +95,9 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithComments() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-with-comments.xml").toURI().toURL(); - XmlModuleDescriptorUpdater.update(settingsUrl, new BufferedOutputStream(buffer, 1024), + URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + + "test-with-comments.xml").toURI().toURL(); + XmlModuleDescriptorUpdater.update(settingsUrl, new BufferedOutputStream(buffer, 1024), getUpdateOptions("release", "mynewrev")); XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); @@ -118,17 +120,18 @@ public class XmlModuleUpdaterTest extend File dest = new File("build/updated-test2.xml"); dest.deleteOnExit(); Map resolvedRevisions = new HashMap(); - resolvedRevisions.put(ModuleRevisionId.newInstance( - "yourorg", "yourmodule2", "branch1", "2+"), "2.5"); - resolvedRevisions.put(ModuleRevisionId.newInstance( - "yourorg", "yourmodule6", "trunk", "latest.integration"), "6.3"); - + resolvedRevisions.put( + ModuleRevisionId.newInstance("yourorg", "yourmodule2", "branch1", "2+"), "2.5"); + resolvedRevisions.put( + ModuleRevisionId.newInstance("yourorg", "yourmodule6", "trunk", "latest.integration"), + "6.3"); + Map resolvedBranches = new HashMap(); resolvedBranches.put(ModuleRevisionId.newInstance("yourorg", "yourmodule3", "3.1"), "branch1"); - resolvedBranches.put(ModuleRevisionId.newInstance( - "yourorg", "yourmodule2", "branch1", "2+"), null); - + resolvedBranches.put( + ModuleRevisionId.newInstance("yourorg", "yourmodule2", "branch1", "2+"), null); + GregorianCalendar cal = new GregorianCalendar(); cal.set(2005, 2, 22, 14, 32, 54); @@ -174,11 +177,12 @@ public class XmlModuleUpdaterTest extend ivy.setVariable("all", "all"); ivy.setVariable("regexp", "regexp"); ivy.setVariable("theirrev", "1.0, 1.1"); - + XmlModuleDescriptorUpdater.update( - XmlModuleUpdaterTest.class.getResource("test-update-withvar.xml"), dest, - getUpdateOptions(ivy.getSettings(), resolvedRevisions, - "release", "mynewrev", cal.getTime()).setResolvedBranches(resolvedBranches)); + XmlModuleUpdaterTest.class.getResource("test-update-withvar.xml"), + dest, + getUpdateOptions(ivy.getSettings(), resolvedRevisions, "release", "mynewrev", + cal.getTime()).setResolvedBranches(resolvedBranches)); assertTrue(dest.exists()); String expected = FileUtil.readEntirely(new BufferedReader(new InputStreamReader( @@ -189,23 +193,23 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithImportedMappingOverride() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-configurations-import4.xml").toURI().toURL(); - XmlModuleDescriptorUpdater.update(settingsUrl, buffer, + URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + + "test-configurations-import4.xml").toURI().toURL(); + XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev")); String updatedXml = buffer.toString(); // just make sure that 'confmappingoverride="true"' is declared somewhere in the XML. - assertTrue("Updated XML doesn't define the confmappingoverride attribute", updatedXml - .indexOf("confmappingoverride=\"true\"") != -1); + assertTrue("Updated XML doesn't define the confmappingoverride attribute", + updatedXml.indexOf("confmappingoverride=\"true\"") != -1); } public void testUpdateWithExcludeConfigurations1() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + "test-update-excludedconfs1.xml").toURI().toURL(); - XmlModuleDescriptorUpdater.update(settingsUrl, buffer, + XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev").setConfsToExclude(new String[] {"myconf2"})); XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); @@ -229,12 +233,12 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations2() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingFile = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs2.xml").toURI().toURL(); + URL settingFile = new File("test/java/org/apache/ivy/plugins/parser/xml/" + + "test-update-excludedconfs2.xml").toURI().toURL(); try { - XmlModuleDescriptorUpdater.update(settingFile, buffer, - getUpdateOptions("release", "mynewrev") - .setConfsToExclude(new String[] {"myconf2"})); + XmlModuleDescriptorUpdater + .update(settingFile, buffer, getUpdateOptions("release", "mynewrev") + .setConfsToExclude(new String[] {"myconf2"})); fail("IllegalArgumentException hasn't been thrown"); } catch (IllegalArgumentException e) { // this is ok @@ -245,12 +249,14 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations3() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs3.xml").toURI().toURL(); + URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + + "test-update-excludedconfs3.xml").toURI().toURL(); - XmlModuleDescriptorUpdater.update(settingsUrl, buffer, - getUpdateOptions("release", "mynewrev") - .setConfsToExclude(new String[] {"myconf2", "conf2"})); + XmlModuleDescriptorUpdater.update( + settingsUrl, + buffer, + getUpdateOptions("release", "mynewrev").setConfsToExclude( + new String[] {"myconf2", "conf2"})); XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), @@ -275,11 +281,11 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations4() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs4.xml").toURI().toURL(); - XmlModuleDescriptorUpdater.update(settingsUrl, buffer, + URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + + "test-update-excludedconfs4.xml").toURI().toURL(); + XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev").setConfsToExclude(new String[] {"myconf2"})); - + XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0, @@ -301,11 +307,10 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations5() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs5.xml").toURI().toURL(); - XmlModuleDescriptorUpdater.update(settingsUrl, buffer, - getUpdateOptions("release", "mynewrev") - .setConfsToExclude(new String[] {"myconf2"})); + URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" + + "test-update-excludedconfs5.xml").toURI().toURL(); + XmlModuleDescriptorUpdater.update(settingsUrl, buffer, + getUpdateOptions("release", "mynewrev").setConfsToExclude(new String[] {"myconf2"})); XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), @@ -322,24 +327,22 @@ public class XmlModuleUpdaterTest extend assertFalse("Dependency " + name + " shouldn't have myconf2 as module configuration", Arrays.asList(deps[i].getModuleConfigurations()).contains("myconf2")); assertEquals("Dependency " + name - + " shouldn't have a dependency artifact for configuration myconf2", 0, deps[i] - .getDependencyArtifacts("myconf2").length); + + " shouldn't have a dependency artifact for configuration myconf2", 0, + deps[i].getDependencyArtifacts("myconf2").length); } } - + // IVY-1356 public void testMergedUpdateWithExtendsAndExcludes() throws Exception { URL url = XmlModuleUpdaterTest.class.getResource("test-extends-dependencies-exclude.xml"); XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); ModuleDescriptor md = parser.parseDescriptor(new IvySettings(), url, true); - + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - XmlModuleDescriptorUpdater.update(url, buffer, - getUpdateOptions("release", "mynewrev") - .setMerge(true) - .setMergedDescriptor(md)); - + XmlModuleDescriptorUpdater.update(url, buffer, getUpdateOptions("release", "mynewrev") + .setMerge(true).setMergedDescriptor(md)); + ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0, false), true); @@ -347,26 +350,23 @@ public class XmlModuleUpdaterTest extend DependencyDescriptor[] deps = updatedMd.getDependencies(); assertNotNull("Dependencies shouldn't be null", deps); assertEquals("Number of dependencies is incorrect", 2, deps.length); - + // test indentation String updatedXml = buffer.toString(); System.out.println(updatedXml); - assertTrue(updatedXml.indexOf(XmlModuleDescriptorUpdater.LINE_SEPARATOR - + "\t\t<dependency org=\"myorg\" name=\"mymodule1\" rev=\"1.0\" conf=\"default->default\"/>" - + XmlModuleDescriptorUpdater.LINE_SEPARATOR) != -1); + assertTrue(updatedXml + .indexOf(XmlModuleDescriptorUpdater.LINE_SEPARATOR + + "\t\t<dependency org=\"myorg\" name=\"mymodule1\" rev=\"1.0\" conf=\"default->default\"/>" + + XmlModuleDescriptorUpdater.LINE_SEPARATOR) != -1); } private UpdateOptions getUpdateOptions(String status, String revision) { return getUpdateOptions(new IvySettings(), new HashMap(), status, revision, new Date()); } - private UpdateOptions getUpdateOptions(IvySettings settings, Map resolvedRevisions, + private UpdateOptions getUpdateOptions(IvySettings settings, Map resolvedRevisions, String status, String revision, Date pubdate) { - return new UpdateOptions() - .setSettings(settings) - .setResolvedRevisions(resolvedRevisions) - .setStatus(status) - .setRevision(revision) - .setPubdate(pubdate); + return new UpdateOptions().setSettings(settings).setResolvedRevisions(resolvedRevisions) + .setStatus(status).setRevision(revision).setPubdate(pubdate); } }
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java Tue Jan 14 08:27:37 2014 @@ -57,8 +57,8 @@ public class XmlReportParserTest extends } public void testGetResolvedModule() throws Exception { - ResolveReport report = _ivy.resolve(new File( - "test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"), + ResolveReport report = _ivy.resolve( + new File("test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"), getResolveOptions(new String[] {"default"}).setValidate(false).setResolveId( "testGetResolvedModule")); assertNotNull(report); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java Tue Jan 14 08:27:37 2014 @@ -77,12 +77,11 @@ public class XmlReportWriterTest extends xml.indexOf(expectedLocation) != -1); assertTrue("XML doesn't contain artifact is-local attribute", xml.indexOf(expectedIsLocal) != -1); - assertTrue("XML doesn't contain the organisation", - xml.indexOf(expectedOrg) != -1); - - //check that the XML is valid - XMLHelper.parse(new ByteArrayInputStream(buffer.toByteArray()), null, - new DefaultHandler(), null); + assertTrue("XML doesn't contain the organisation", xml.indexOf(expectedOrg) != -1); + + // check that the XML is valid + XMLHelper.parse(new ByteArrayInputStream(buffer.toByteArray()), null, new DefaultHandler(), + null); } public void testEscapeXml() throws Exception { @@ -91,17 +90,16 @@ public class XmlReportWriterTest extends "test/java/org/apache/ivy/plugins/report/ivy-635.xml"), getResolveOptions(new String[] {"default"})); assertNotNull(report); - + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); XmlReportWriter writer = new XmlReportWriter(); writer.output(report.getConfigurationReport("default"), buffer); buffer.flush(); String xml = buffer.toString(); - + String expectedArtName = "art1&_.txt"; - assertTrue("XML doesn't contain escaped artifact name", - xml.indexOf(expectedArtName) != -1); + assertTrue("XML doesn't contain escaped artifact name", xml.indexOf(expectedArtName) != -1); } public void testWriteModuleInfo() throws Exception { Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java Tue Jan 14 08:27:37 2014 @@ -86,24 +86,25 @@ public class VfsResourceTest extends Tes } /** - * Escape invalid URL characters (Copied from Wicket, just use StringUtils instead of Strings) - * - * @param queryString The orginal querystring - * @return url The querystring with invalid characters escaped - */ + * Escape invalid URL characters (Copied from Wicket, just use StringUtils instead of Strings) + * + * @param queryString + * The orginal querystring + * @return url The querystring with invalid characters escaped + */ private String escapeUrl(String queryString) { - queryString = StringUtils.replace(queryString , " ", "%20"); - queryString = StringUtils.replace(queryString , "\"", "%22"); - queryString = StringUtils.replace(queryString , "%", "%26"); - queryString = StringUtils.replace(queryString , "=", "%3D"); - queryString = StringUtils.replace(queryString , "/", "%2F"); - queryString = StringUtils.replace(queryString , "+", "%2B"); - queryString = StringUtils.replace(queryString , "&", "%26"); - queryString = StringUtils.replace(queryString , "~", "%7E"); - queryString = StringUtils.replace(queryString , "?", "%3F"); + queryString = StringUtils.replace(queryString, " ", "%20"); + queryString = StringUtils.replace(queryString, "\"", "%22"); + queryString = StringUtils.replace(queryString, "%", "%26"); + queryString = StringUtils.replace(queryString, "=", "%3D"); + queryString = StringUtils.replace(queryString, "/", "%2F"); + queryString = StringUtils.replace(queryString, "+", "%2B"); + queryString = StringUtils.replace(queryString, "&", "%26"); + queryString = StringUtils.replace(queryString, "~", "%7E"); + queryString = StringUtils.replace(queryString, "?", "%3F"); return queryString; - } - + } + /** * Validating that resource can be created for files which don't physically exists - e.g. * resources that are going to created. Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java Tue Jan 14 08:27:37 2014 @@ -43,7 +43,7 @@ public class VfsURI { public static final String SCHEME_SFTP = "sftp"; - public static final String SCHEME_WEBDAV = "webdav"; + public static final String SCHEME_WEBDAV = "webdav"; public static final String[] SUPPORTED_SCHEMES = new String[] { // add other schemes here if other can be tested on your machine @@ -59,24 +59,23 @@ public class VfsURI { public static VfsURI vfsURIFactory(String scheme, String resource, Ivy ivy) { VfsURI vfsURI = null; if (scheme.equals(SCHEME_CIFS)) { - vfsURI = new VfsURI(SCHEME_CIFS, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), ivy - .getVariable(VfsTestHelper.PROP_VFS_USER_PASSWD), ivy - .getVariable(VfsTestHelper.PROP_VFS_HOST), ivy - .getVariable(VfsTestHelper.PROP_VFS_SAMBA_REPO) - + "/" + resource); + vfsURI = new VfsURI(SCHEME_CIFS, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), + ivy.getVariable(VfsTestHelper.PROP_VFS_USER_PASSWD), + ivy.getVariable(VfsTestHelper.PROP_VFS_HOST), + ivy.getVariable(VfsTestHelper.PROP_VFS_SAMBA_REPO) + "/" + resource); } else if (scheme.equals(SCHEME_FILE)) { vfsURI = new VfsURI(SCHEME_FILE, null, null, null, VfsTestHelper.CWD + "/" + VfsTestHelper.TEST_REPO_DIR + "/" + resource); } else if (scheme.equals(SCHEME_FTP)) { - vfsURI = new VfsURI(SCHEME_FTP, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), ivy - .getVariable(VfsTestHelper.PROP_VFS_USER_PASSWD), ivy - .getVariable(VfsTestHelper.PROP_VFS_HOST), VfsTestHelper.CWD + "/" - + VfsTestHelper.TEST_REPO_DIR + "/" + resource); + vfsURI = new VfsURI(SCHEME_FTP, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), + ivy.getVariable(VfsTestHelper.PROP_VFS_USER_PASSWD), + ivy.getVariable(VfsTestHelper.PROP_VFS_HOST), VfsTestHelper.CWD + "/" + + VfsTestHelper.TEST_REPO_DIR + "/" + resource); } else if (scheme.equals(SCHEME_SFTP)) { - vfsURI = new VfsURI(SCHEME_SFTP, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), ivy - .getVariable(VfsTestHelper.PROP_VFS_USER_PASSWD), ivy - .getVariable(VfsTestHelper.PROP_VFS_HOST), VfsTestHelper.CWD + "/" - + VfsTestHelper.TEST_REPO_DIR + "/" + resource); + vfsURI = new VfsURI(SCHEME_SFTP, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), + ivy.getVariable(VfsTestHelper.PROP_VFS_USER_PASSWD), + ivy.getVariable(VfsTestHelper.PROP_VFS_HOST), VfsTestHelper.CWD + "/" + + VfsTestHelper.TEST_REPO_DIR + "/" + resource); } return vfsURI; } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java Tue Jan 14 08:27:37 2014 @@ -114,8 +114,8 @@ public class ChainResolverTest extends A } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "rev"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "rev"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); @@ -130,24 +130,23 @@ public class ChainResolverTest extends A chain.setSettings(settings); settings.setDefaultLatestStrategy(new LatestTimeStrategy()); MockResolver[] resolvers = new MockResolver[] { - MockResolver.buildMockResolver(settings, "1", true, new GregorianCalendar(2005, 1, 20) - .getTime()), + MockResolver.buildMockResolver(settings, "1", true, new GregorianCalendar(2005, 1, + 20).getTime()), MockResolver.buildMockResolver(settings, "2", false, null), - MockResolver.buildMockResolver(settings, "3", true, new GregorianCalendar(2005, 1, 25) - .getTime()), // younger -> should the one kept + MockResolver.buildMockResolver(settings, "3", true, new GregorianCalendar(2005, 1, + 25).getTime()), // younger -> should the one kept MockResolver.buildMockResolver(settings, "4", false, null), - MockResolver.buildMockResolver(settings, "5", true, new GregorianCalendar(2005, 1, 22) - .getTime()), - MockResolver.buildMockResolver(settings, "6", true, new GregorianCalendar(2005, 1, 18) - .getTime()), - MockResolver.buildMockResolver(settings, "7", false, null)}; + MockResolver.buildMockResolver(settings, "5", true, new GregorianCalendar(2005, 1, + 22).getTime()), + MockResolver.buildMockResolver(settings, "6", true, new GregorianCalendar(2005, 1, + 18).getTime()), MockResolver.buildMockResolver(settings, "7", false, null)}; for (int i = 0; i < resolvers.length; i++) { chain.add(resolvers[i]); } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "latest.integration"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "latest.integration"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("3", rmr.getResolver().getName()); @@ -163,26 +162,26 @@ public class ChainResolverTest extends A chain.setSettings(settings); chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { - MockResolver.buildMockResolver(settings, "1", true, ModuleRevisionId.newInstance("org", - "mod", "1"), new GregorianCalendar(2005, 1, 20).getTime()), + MockResolver.buildMockResolver(settings, "1", true, ModuleRevisionId.newInstance( + "org", "mod", "1"), new GregorianCalendar(2005, 1, 20).getTime()), MockResolver.buildMockResolver(settings, "2", false, null), - MockResolver.buildMockResolver(settings, "3", true, ModuleRevisionId.newInstance("org", - "mod", "2"), new GregorianCalendar(2005, 1, 25).getTime()), + MockResolver.buildMockResolver(settings, "3", true, ModuleRevisionId.newInstance( + "org", "mod", "2"), new GregorianCalendar(2005, 1, 25).getTime()), MockResolver.buildMockResolver(settings, "4", false, null), - MockResolver.buildMockResolver(settings, "5", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // latest -> + MockResolver.buildMockResolver(settings, "5", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // latest -> // should the // one kept - MockResolver.buildMockResolver(settings, "6", true, ModuleRevisionId.newInstance("org", - "mod", "3"), new GregorianCalendar(2005, 1, 18).getTime()), + MockResolver.buildMockResolver(settings, "6", true, ModuleRevisionId.newInstance( + "org", "mod", "3"), new GregorianCalendar(2005, 1, 18).getTime()), MockResolver.buildMockResolver(settings, "7", false, null)}; for (int i = 0; i < resolvers.length; i++) { chain.add(resolvers[i]); } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "latest.integration"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "latest.integration"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); @@ -199,15 +198,15 @@ public class ChainResolverTest extends A chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver(settings, "1", false, null), - MockResolver.buildMockResolver(settings, "2", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime(), true), // latest + MockResolver.buildMockResolver(settings, "2", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime(), true), // latest // -> // but // default MockResolver.buildMockResolver(settings, "3", false, null), MockResolver.buildMockResolver(settings, "4", false, null), - MockResolver.buildMockResolver(settings, "5", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // latest -> + MockResolver.buildMockResolver(settings, "5", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // latest -> // should the // one kept MockResolver.buildMockResolver(settings, "6", false, null), @@ -217,8 +216,8 @@ public class ChainResolverTest extends A } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "4"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "4"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); @@ -237,30 +236,30 @@ public class ChainResolverTest extends A chain.setSettings(settings); chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { - MockResolver.buildMockResolver(settings, "1", true, ModuleRevisionId.newInstance("org", - "mod", "1"), new GregorianCalendar(2005, 1, 20).getTime()), - MockResolver.buildMockResolver(settings, "2", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime(), true), // latest + MockResolver.buildMockResolver(settings, "1", true, ModuleRevisionId.newInstance( + "org", "mod", "1"), new GregorianCalendar(2005, 1, 20).getTime()), + MockResolver.buildMockResolver(settings, "2", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime(), true), // latest // -> // but // default - MockResolver.buildMockResolver(settings, "3", true, ModuleRevisionId.newInstance("org", - "mod", "2"), new GregorianCalendar(2005, 1, 25).getTime()), + MockResolver.buildMockResolver(settings, "3", true, ModuleRevisionId.newInstance( + "org", "mod", "2"), new GregorianCalendar(2005, 1, 25).getTime()), MockResolver.buildMockResolver(settings, "4", false, null), - MockResolver.buildMockResolver(settings, "5", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // latest -> + MockResolver.buildMockResolver(settings, "5", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // latest -> // should the // one kept - MockResolver.buildMockResolver(settings, "6", true, ModuleRevisionId.newInstance("org", - "mod", "3"), new GregorianCalendar(2005, 1, 18).getTime()), + MockResolver.buildMockResolver(settings, "6", true, ModuleRevisionId.newInstance( + "org", "mod", "3"), new GregorianCalendar(2005, 1, 18).getTime()), MockResolver.buildMockResolver(settings, "7", false, null)}; for (int i = 0; i < resolvers.length; i++) { chain.add(resolvers[i]); } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "latest.integration"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "latest.integration"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); @@ -277,11 +276,12 @@ public class ChainResolverTest extends A chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver(settings, "1", false, null), - MockResolver.buildMockResolver(settings, "2", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime(), true), // default + MockResolver.buildMockResolver(settings, "2", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime(), true), // default MockResolver.buildMockResolver(settings, "3", false, null), - MockResolver.buildMockResolver(settings, "4", true, ModuleRevisionId.newInstance("org", - "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // not default + MockResolver.buildMockResolver(settings, "4", true, ModuleRevisionId.newInstance( + "org", "mod", "4"), new GregorianCalendar(2005, 1, 22).getTime()), // not + // default // -> should the // one kept MockResolver.buildMockResolver(settings, "5", false, null)}; @@ -290,8 +290,8 @@ public class ChainResolverTest extends A } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "4"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "4"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("4", rmr.getResolver().getName()); @@ -301,8 +301,8 @@ public class ChainResolverTest extends A resolvers[i].askedDeps); } for (int i = 4; i < resolvers.length; i++) { - assertTrue("invalid asked dependencies for " + resolvers[i], resolvers[i].askedDeps - .isEmpty()); + assertTrue("invalid asked dependencies for " + resolvers[i], + resolvers[i].askedDeps.isEmpty()); } } @@ -317,8 +317,8 @@ public class ChainResolverTest extends A resolver.setName("1"); resolver.setSettings(settings); - resolver.addArtifactPattern( - settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); // second resolver has an ivy pattern and will thus find the real module, which should be @@ -327,33 +327,32 @@ public class ChainResolverTest extends A resolver.setName("2"); resolver.setSettings(settings); - resolver - .addIvyPattern(settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); - resolver - .addArtifactPattern(settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addIvyPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org1", "mod1.1", "1.0"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); } - public void testUseCache() throws Exception { - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org1", "mod1.1", "1.0"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false); // resolve dependency twice chainToPutDefaultModuleInCache().getDependency(dd, data); ChainResolver chain = new ChainResolver(); chain.setName("chain"); chain.setSettings(settings); - MockResolver[] resolvers = new MockResolver[] { - MockResolver.buildMockResolver(settings, "1", true, null)}; + MockResolver[] resolvers = new MockResolver[] {MockResolver.buildMockResolver(settings, + "1", true, null)}; for (int i = 0; i < resolvers.length; i++) { chain.add(resolvers[i]); } @@ -362,31 +361,30 @@ public class ChainResolverTest extends A assertEquals(Collections.EMPTY_LIST, resolvers[0].askedDeps); } - public void testReturnFirst() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); chain.setSettings(settings); chain.setReturnFirst(true); - + MockResolver[] resolvers = new MockResolver[] { - MockResolver.buildMockResolver(settings, "1", true, new GregorianCalendar(2005, 1, 20) - .getTime()), + MockResolver.buildMockResolver(settings, "1", true, new GregorianCalendar(2005, 1, + 20).getTime()), MockResolver.buildMockResolver(settings, "2", false, null), - MockResolver.buildMockResolver(settings, "3", true, new GregorianCalendar(2005, 1, 25) - .getTime()), // younger -> should the one kept + MockResolver.buildMockResolver(settings, "3", true, new GregorianCalendar(2005, 1, + 25).getTime()), // younger -> should the one kept MockResolver.buildMockResolver(settings, "4", false, null), - MockResolver.buildMockResolver(settings, "5", true, new GregorianCalendar(2005, 1, 22) - .getTime()), - MockResolver.buildMockResolver(settings, "6", true, new GregorianCalendar(2005, 1, 18) - .getTime()), MockResolver.buildMockResolver(settings, "7", false, null)}; + MockResolver.buildMockResolver(settings, "5", true, new GregorianCalendar(2005, 1, + 22).getTime()), + MockResolver.buildMockResolver(settings, "6", true, new GregorianCalendar(2005, 1, + 18).getTime()), MockResolver.buildMockResolver(settings, "7", false, null)}; for (int i = 0; i < resolvers.length; i++) { chain.add(resolvers[i]); } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "latest.integration"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "latest.integration"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("1", rmr.getResolver().getName()); @@ -397,8 +395,8 @@ public class ChainResolverTest extends A public void testReturnFirstWithDefaultAndCacheAndRealResolver() throws Exception { // test case for IVY-389 - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org1", "mod1.1", "1.0"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false); // 1 ---- we first do a first resolve which puts a default file in cache chainToPutDefaultModuleInCache().getDependency(dd, data); @@ -410,15 +408,17 @@ public class ChainResolverTest extends A ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); - // the module returned should be the default one found in cache since check modified is false + // the module returned should be the default one found in cache since check modified is + // false assertEquals(true, rmr.getDescriptor().isDefault()); } - public void testReturnFirstWithCheckModifiedAndDefaultAndCacheAndRealResolver() throws Exception { + public void testReturnFirstWithCheckModifiedAndDefaultAndCacheAndRealResolver() + throws Exception { // test case for IVY-207 - - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org1", "mod1.1", "1.0"), false); + + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false); // 1 ---- we first do a first resolve which puts a default file in cache chainToPutDefaultModuleInCache().getDependency(dd, data); @@ -452,10 +452,10 @@ public class ChainResolverTest extends A resolver.setName("2"); resolver.setSettings(settings); - resolver.addIvyPattern( - settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); - resolver.addArtifactPattern( - settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addIvyPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); @@ -472,8 +472,8 @@ public class ChainResolverTest extends A resolver.setName("old"); resolver.setSettings(settings); - resolver.addArtifactPattern( - settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); @@ -494,8 +494,8 @@ public class ChainResolverTest extends A } assertResolversSizeAndNames(chain, resolvers.length); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "rev"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "rev"), false); ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); @@ -508,12 +508,13 @@ public class ChainResolverTest extends A chain.setSettings(settings); chain.setDual(true); - // first resolver has only an artifact pattern which don't lead to anything: it won't find the module + // first resolver has only an artifact pattern which don't lead to anything: it won't find + // the module FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("1"); resolver.setSettings(settings); - resolver.addArtifactPattern( - settings.getBaseDir() + "/test/repositories/nowhere/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/nowhere/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); @@ -521,10 +522,10 @@ public class ChainResolverTest extends A resolver.setName("2"); resolver.setSettings(settings); - resolver.addIvyPattern( - settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); - resolver.addArtifactPattern( - settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); + resolver.addIvyPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); settings.addResolver(chain); @@ -532,15 +533,12 @@ public class ChainResolverTest extends A MockMessageLogger mockLogger = new MockMessageLogger(); IvyContext.getContext().getIvy().getLoggerEngine().setDefaultLogger(mockLogger); DownloadReport report = chain.download( - new Artifact[] {new DefaultArtifact( - ModuleRevisionId.parse("org1#mod1.1;1.0"), - new Date(), "mod1.1", "jar", "jar")}, - new DownloadOptions()); + new Artifact[] {new DefaultArtifact(ModuleRevisionId.parse("org1#mod1.1;1.0"), + new Date(), "mod1.1", "jar", "jar")}, new DownloadOptions()); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); assertEquals(DownloadStatus.SUCCESSFUL, report.getArtifactsReports()[0].getDownloadStatus()); mockLogger.assertLogDoesntContain("[FAILED ] org1#mod1.1;1.0!mod1.1.jar"); } - } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java Tue Jan 14 08:27:37 2014 @@ -91,8 +91,8 @@ public class DualResolverTest extends Ab public void testBad() throws Exception { DualResolver dual = new DualResolver(); dual.setIvyResolver(new IBiblioResolver()); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "rev"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "rev"), false); try { dual.getDependency(dd, _data); fail("bad dual resolver configuration should raise exception"); @@ -105,12 +105,12 @@ public class DualResolverTest extends Ab DualResolver dual = new DualResolver(); MockResolver ivyResolver = MockResolver.buildMockResolver(_settings, "ivy", true, new GregorianCalendar(2005, 1, 20).getTime()); - MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", false, - new GregorianCalendar(2005, 1, 20).getTime()); + MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", + false, new GregorianCalendar(2005, 1, 20).getTime()); dual.setIvyResolver(ivyResolver); dual.setArtifactResolver(artifactResolver); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "rev"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "rev"), false); ResolvedModuleRevision rmr = dual.getDependency(dd, _data); assertNotNull(rmr); @@ -127,8 +127,8 @@ public class DualResolverTest extends Ab new GregorianCalendar(2005, 1, 20).getTime()); dual.setIvyResolver(ivyResolver); dual.setArtifactResolver(artifactResolver); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "rev"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "rev"), false); ResolvedModuleRevision rmr = dual.getDependency(dd, _data); assertNotNull(rmr); @@ -141,12 +141,12 @@ public class DualResolverTest extends Ab DualResolver dual = new DualResolver(); MockResolver ivyResolver = MockResolver.buildMockResolver(_settings, "ivy", false, new GregorianCalendar(2005, 1, 20).getTime()); - MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", false, - new GregorianCalendar(2005, 1, 20).getTime()); + MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", + false, new GregorianCalendar(2005, 1, 20).getTime()); dual.setIvyResolver(ivyResolver); dual.setArtifactResolver(artifactResolver); - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId - .newInstance("org", "mod", "rev"), false); + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( + ModuleRevisionId.newInstance("org", "mod", "rev"), false); ResolvedModuleRevision rmr = dual.getDependency(dd, _data); assertNull(rmr);
