Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 1776 invoked from network); 2 Dec 2007 23:06:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2007 23:06:47 -0000 Received: (qmail 92828 invoked by uid 500); 2 Dec 2007 23:06:36 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 92813 invoked by uid 500); 2 Dec 2007 23:06:35 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 92804 invoked by uid 99); 2 Dec 2007 23:06:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Dec 2007 15:06:35 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Dec 2007 23:06:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E77961A9832; Sun, 2 Dec 2007 15:06:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600405 - /ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java Date: Sun, 02 Dec 2007 23:06:26 -0000 To: notifications@ant.apache.org From: xavier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071202230626.E77961A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xavier Date: Sun Dec 2 15:06:25 2007 New Revision: 600405 URL: http://svn.apache.org/viewvc?rev=600405&view=rev Log: fix style Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java 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=600405&r1=600404&r2=600405&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 Sun Dec 2 15:06:25 2007 @@ -45,35 +45,35 @@ * Tests ChainResolver */ public class ChainResolverTest extends TestCase { - private IvySettings _settings; + private IvySettings settings; - private ResolveEngine _engine; + private ResolveEngine engine; - private ResolveData _data; + private ResolveData data; - private File _cache; + private File cache; protected void setUp() throws Exception { - _settings = new IvySettings(); - _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _cache = new File("build/cache"); - _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance( - _settings, _cache))); - _cache.mkdirs(); - _settings.setDefaultCache(_cache); + 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))); + cache.mkdirs(); + settings.setDefaultCache(cache); } protected void tearDown() throws Exception { Delete del = new Delete(); del.setProject(new Project()); - del.setDir(_cache); + del.setDir(cache); del.execute(); } public void testOrderFromConf() throws Exception { - new XmlSettingsParser(_settings).parse(ChainResolverTest.class + new XmlSettingsParser(settings).parse(ChainResolverTest.class .getResource("chainresolverconf.xml")); - DependencyResolver resolver = _settings.getResolver("chain"); + DependencyResolver resolver = settings.getResolver("chain"); assertNotNull(resolver); assertTrue(resolver instanceof ChainResolver); ChainResolver chain = (ChainResolver) resolver; @@ -91,7 +91,7 @@ public void testName() throws Exception { ChainResolver chain = new ChainResolver(); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setName("chain"); assertEquals("chain", chain.getName()); } @@ -99,7 +99,7 @@ public void testResolveOrder() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", false, null), MockResolver.buildMockResolver("2", true, null), @@ -111,7 +111,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "rev"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), resolvers[0].askedDeps); @@ -122,7 +122,7 @@ public void testLatestTimeResolve() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setLatestStrategy(new LatestTimeStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", true, new GregorianCalendar(2005, 1, 20) @@ -142,7 +142,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "latest.integration"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("3", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); @@ -154,7 +154,7 @@ public void testLatestRevisionResolve() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", true, ModuleRevisionId.newInstance("org", @@ -177,7 +177,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "latest.integration"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); @@ -189,7 +189,7 @@ public void testWithDefault() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", false, null), @@ -213,7 +213,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "4"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); @@ -228,7 +228,7 @@ public void testLatestWithDefault() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", true, ModuleRevisionId.newInstance("org", @@ -255,7 +255,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "latest.integration"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("5", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); @@ -267,7 +267,7 @@ public void testFixedWithDefault() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setLatestStrategy(new LatestRevisionStrategy()); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", false, null), @@ -286,7 +286,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "4"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("4", rmr.getResolver().getName()); List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd}); @@ -304,12 +304,12 @@ // test case for IVY-206 ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); // no ivy pattern for first resolver: will only find a 'default' module FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("1"); - resolver.setSettings(_settings); + resolver.setSettings(settings); resolver .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); @@ -319,7 +319,7 @@ // kept resolver = new FileSystemResolver(); resolver.setName("2"); - resolver.setSettings(_settings); + resolver.setSettings(settings); resolver .addIvyPattern("test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); @@ -327,11 +327,11 @@ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); - _settings.addResolver(chain); + settings.addResolver(chain); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org1", "mod1.1", "1.0"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); } @@ -339,7 +339,7 @@ public void testReturnFirst() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setReturnFirst(true); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", true, new GregorianCalendar(2005, 1, 20) @@ -359,7 +359,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "latest.integration"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("1", rmr.getResolver().getName()); for (int i = 1; i < resolvers.length; i++) { @@ -373,22 +373,22 @@ // 1 ---- we first do a first resolve which puts a default file in cache ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); // no ivy pattern for resolver: will only find a 'default' module FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("old"); - resolver.setSettings(_settings); + resolver.setSettings(settings); resolver .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); - _settings.addResolver(chain); + settings.addResolver(chain); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org1", "mod1.1", "1.0"), false); - chain.getDependency(dd, _data); + chain.getDependency(dd, data); // 2 ---- now we ask to resolve dependencies with a chain in return first mode, in which the // first resolver @@ -396,20 +396,20 @@ chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setReturnFirst(true); // no pattern for first resolver: will not find the module resolver = new FileSystemResolver(); resolver.setName("1"); - resolver.setSettings(_settings); + resolver.setSettings(settings); chain.add(resolver); // second resolver will find the real module, which should be kept resolver = new FileSystemResolver(); resolver.setName("2"); - resolver.setSettings(_settings); + resolver.setSettings(settings); resolver .addIvyPattern("test/repositories/1/[organisation]/[module]/ivys/ivy-[revision].xml"); @@ -417,9 +417,9 @@ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); chain.add(resolver); - _settings.addResolver(chain); + settings.addResolver(chain); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); } @@ -427,7 +427,7 @@ public void testDual() throws Exception { ChainResolver chain = new ChainResolver(); chain.setName("chain"); - chain.setSettings(_settings); + chain.setSettings(settings); chain.setDual(true); MockResolver[] resolvers = new MockResolver[] { MockResolver.buildMockResolver("1", false, null), @@ -440,7 +440,7 @@ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId .newInstance("org", "mod", "rev"), false); - ResolvedModuleRevision rmr = chain.getDependency(dd, _data); + ResolvedModuleRevision rmr = chain.getDependency(dd, data); assertNotNull(rmr); assertEquals("2", rmr.getResolver().getName()); assertEquals("chain", rmr.getArtifactResolver().getName());