Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4B4C9200D3D for ; Mon, 13 Nov 2017 16:00:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 497B6160BF3; Mon, 13 Nov 2017 15:00:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 48210160BE4 for ; Mon, 13 Nov 2017 16:00:26 +0100 (CET) Received: (qmail 16808 invoked by uid 500); 13 Nov 2017 15:00:25 -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 16799 invoked by uid 99); 13 Nov 2017 15:00:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Nov 2017 15:00:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5607FDFBCA; Mon, 13 Nov 2017 15:00:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gintas@apache.org To: notifications@ant.apache.org Message-Id: <196ce382e0b84a86a210fb59e6e62daf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ant-ivy git commit: IVY-511 coding conventions Date: Mon, 13 Nov 2017 15:00:25 +0000 (UTC) archived-at: Mon, 13 Nov 2017 15:00:28 -0000 Repository: ant-ivy Updated Branches: refs/heads/master 46c7cba7d -> 9a686e738 IVY-511 coding conventions Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/9a686e73 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/9a686e73 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/9a686e73 Branch: refs/heads/master Commit: 9a686e7388c5ded097e6c5ffb1554ec2461113c1 Parents: 46c7cba Author: Gintas Grigelionis Authored: Mon Nov 13 16:00:31 2017 +0100 Committer: Gintas Grigelionis Committed: Mon Nov 13 16:00:31 2017 +0100 ---------------------------------------------------------------------- .../ivy/osgi/core/OsgiLatestStrategyTest.java | 22 +- .../conflict/LatestConflictManagerTest.java | 8 +- .../conflict/RegexpConflictManagerTest.java | 8 +- .../latest/LatestRevisionStrategyTest.java | 14 +- .../m2/PomModuleDescriptorWriterTest.java | 86 +++---- .../ivy/plugins/report/XmlReportWriterTest.java | 22 +- .../plugins/resolver/BintrayResolverTest.java | 30 +-- .../ivy/plugins/resolver/DualResolverTest.java | 48 ++-- .../plugins/resolver/IBiblioResolverTest.java | 48 ++-- .../plugins/resolver/IvyRepResolverTest.java | 32 +-- .../org/apache/ivy/util/ConfiguratorTest.java | 256 +++++++++---------- .../org/apache/ivy/util/MockMessageLogger.java | 40 +-- 12 files changed, 307 insertions(+), 307 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java b/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java index e385f5d..ed66e0c 100644 --- a/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java +++ b/test/java/org/apache/ivy/osgi/core/OsgiLatestStrategyTest.java @@ -76,33 +76,33 @@ public class OsgiLatestStrategyTest { private static class MockArtifactInfo implements ArtifactInfo { - private long _lastModified; + private long lastModified; - private String _rev; + private String rev; public MockArtifactInfo(String rev, long lastModified) { - _rev = rev; - _lastModified = lastModified; + this.rev = rev; + this.lastModified = lastModified; } public String getRevision() { - return _rev; + return rev; } public long getLastModified() { - return _lastModified; + return lastModified; } public String toString() { - return _rev; + return rev; } } private ArtifactInfo[] toMockAI(String[] revs) { - ArtifactInfo[] artifactInfos = new ArtifactInfo[revs.length]; - for (int i = 0; i < artifactInfos.length; i++) { - artifactInfos[i] = new MockArtifactInfo(revs[i], 0); + List artifactInfos = new ArrayList<>(); + for (String rev : revs) { + artifactInfos.add(new MockArtifactInfo(rev, 0)); } - return artifactInfos; + return artifactInfos.toArray(new ArtifactInfo[artifactInfos.size()]); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java index 3fd6d3f..6aca263 100644 --- a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java +++ b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java @@ -39,19 +39,19 @@ public class LatestConflictManagerTest { private Ivy ivy; - private File _cache; + private File cache; @Before public void setUp() throws Exception { ivy = new Ivy(); ivy.configure(LatestConflictManagerTest.class.getResource("ivysettings-latest.xml")); - _cache = new File("build/cache"); - _cache.mkdirs(); + cache = new File("build/cache"); + cache.mkdirs(); } @After public void tearDown() { - FileUtil.forceDelete(_cache); + FileUtil.forceDelete(cache); } /** http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java index 94ac7a4..de72753 100644 --- a/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java +++ b/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java @@ -33,7 +33,7 @@ import org.junit.rules.ExpectedException; public class RegexpConflictManagerTest { private Ivy ivy; - private File _cache; + private File cache; @Rule public ExpectedException expExc = ExpectedException.none(); @@ -42,13 +42,13 @@ public class RegexpConflictManagerTest { public void setUp() throws Exception { ivy = new Ivy(); ivy.configure(RegexpConflictManagerTest.class.getResource("ivysettings-regexp-test.xml")); - _cache = new File("build/cache"); - _cache.mkdirs(); + cache = new File("build/cache"); + cache.mkdirs(); } @After public void tearDown() { - FileUtil.forceDelete(_cache); + FileUtil.forceDelete(cache); } @Test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java b/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java index 1b48faa..7ddfee8 100644 --- a/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java +++ b/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java @@ -92,25 +92,25 @@ public class LatestRevisionStrategyTest { private static class MockArtifactInfo implements ArtifactInfo { - private long _lastModified; + private long lastModified; - private String _rev; + private String rev; public MockArtifactInfo(String rev, long lastModified) { - _rev = rev; - _lastModified = lastModified; + this.rev = rev; + this.lastModified = lastModified; } public String getRevision() { - return _rev; + return rev; } public long getLastModified() { - return _lastModified; + return lastModified; } public String toString() { - return _rev; + return rev; } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java index 8eb1808..40ec83b 100644 --- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java +++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java @@ -45,16 +45,16 @@ public class PomModuleDescriptorWriterTest { } } - private File _dest = new File("build/test/test-write.xml"); + private File dest = new File("build/test/test-write.xml"); @Test public void testSimple() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-simple.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-simple.xml").replaceAll("\r\n", "\n").replace( '\r', '\n'); @@ -65,10 +65,10 @@ public class PomModuleDescriptorWriterTest { public void testSimpleDependencies() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-simple-dependencies.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -79,10 +79,10 @@ public class PomModuleDescriptorWriterTest { public void testDependenciesWithScope() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-dependencies-with-scope.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -93,10 +93,10 @@ public class PomModuleDescriptorWriterTest { public void testDependenciesWithType() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-type.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-dependencies-with-type.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -108,10 +108,10 @@ public class PomModuleDescriptorWriterTest { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-classifier.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-dependencies-with-classifier.xml").replaceAll( "\r\n", "\n").replace('\r', '\n'); @@ -122,10 +122,10 @@ public class PomModuleDescriptorWriterTest { public void testOptional() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-optional.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-dependencies-optional.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -136,10 +136,10 @@ public class PomModuleDescriptorWriterTest { public void testTransitive() throws Exception { ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-transitive.xml"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); System.out.println(wrote); String expected = readEntirely("test-transitive.pom").replaceAll("\r\n", "\n").replace( @@ -151,10 +151,10 @@ public class PomModuleDescriptorWriterTest { public void testPackaging() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-packaging.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions()); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-packaging.xml").replaceAll("\r\n", "\n") .replace('\r', '\n'); @@ -165,11 +165,11 @@ public class PomModuleDescriptorWriterTest { public void testWriteCompileConfigurationOnly() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, + PomModuleDescriptorWriter.write(md, dest, getWriterOptions().setConfs(new String[] {"compile"})); - assertTrue(_dest.exists()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-compile-dependencies.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -180,11 +180,11 @@ public class PomModuleDescriptorWriterTest { public void testWriteRuntimeConfigurationOnly() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, + PomModuleDescriptorWriter.write(md, dest, getWriterOptions().setConfs(new String[] {"runtime"})); - assertTrue(_dest.exists()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-dependencies-with-scope.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -195,10 +195,10 @@ public class PomModuleDescriptorWriterTest { public void testWriteAllConfiguration() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, getWriterOptions().setConfs(new String[] {"*"})); - assertTrue(_dest.exists()); + PomModuleDescriptorWriter.write(md, dest, getWriterOptions().setConfs(new String[] {"*"})); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-dependencies-with-scope.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -209,11 +209,11 @@ public class PomModuleDescriptorWriterTest { public void testWriteAllExceptRuntimeConfiguration() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false); - PomModuleDescriptorWriter.write(md, _dest, + PomModuleDescriptorWriter.write(md, dest, getWriterOptions().setConfs(new String[] {"*", "!runtime"})); - assertTrue(_dest.exists()); + assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))) + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) .replaceAll("\r\n", "\n").replace('\r', '\n'); String expected = readEntirely("test-write-compile-dependencies.xml").replaceAll("\r\n", "\n").replace('\r', '\n'); @@ -231,18 +231,18 @@ public class PomModuleDescriptorWriterTest { @Before public void setUp() { - if (_dest.exists()) { - _dest.delete(); + if (dest.exists()) { + dest.delete(); } - if (!_dest.getParentFile().exists()) { - _dest.getParentFile().mkdirs(); + if (!dest.getParentFile().exists()) { + dest.getParentFile().mkdirs(); } } @After public void tearDown() { - if (_dest.exists()) { - _dest.delete(); + if (dest.exists()) { + dest.delete(); } } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java b/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java index 638e8c0..4b36e85 100644 --- a/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java +++ b/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java @@ -35,20 +35,20 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; public class XmlReportWriterTest { - private Ivy _ivy; + private Ivy ivy; - private File _cache; + private File cache; @Before public void setUp() throws Exception { - _ivy = new Ivy(); - _ivy.configure(new File("test/repositories/ivysettings.xml")); + ivy = new Ivy(); + ivy.configure(new File("test/repositories/ivysettings.xml")); createCache(); } private void createCache() { - _cache = new File("build/cache"); - _cache.mkdirs(); + cache = new File("build/cache"); + cache.mkdirs(); } @After @@ -57,12 +57,12 @@ public class XmlReportWriterTest { } private void cleanCache() { - CacheCleaner.deleteDir(_cache); + CacheCleaner.deleteDir(cache); } @Test public void testWriteOrigin() throws Exception { - ResolveReport report = _ivy.resolve(new File( + ResolveReport report = ivy.resolve(new File( "test/repositories/1/special-encoding-root-ivy.xml"), getResolveOptions(new String[] {"default"})); assertNotNull(report); @@ -92,8 +92,8 @@ public class XmlReportWriterTest { @Test public void testEscapeXml() throws Exception { - _ivy.configure(new File("test/repositories/IVY-635/ivysettings.xml")); - ResolveReport report = _ivy.resolve(new File( + ivy.configure(new File("test/repositories/IVY-635/ivysettings.xml")); + ResolveReport report = ivy.resolve(new File( "test/java/org/apache/ivy/plugins/report/ivy-635.xml"), getResolveOptions(new String[] {"default"})); assertNotNull(report); @@ -111,7 +111,7 @@ public class XmlReportWriterTest { @Test public void testWriteModuleInfo() throws Exception { - ResolveReport report = _ivy.resolve(new File( + ResolveReport report = ivy.resolve(new File( "test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"), getResolveOptions(new String[] {"default"}).setValidate(false)); assertNotNull(report); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java index 1bec25a..1267189 100644 --- a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java @@ -47,18 +47,18 @@ import static org.junit.Assert.assertNull; public class BintrayResolverTest extends AbstractDependencyResolverTest { - private IvySettings _settings; + private IvySettings settings; - private ResolveEngine _engine; + private ResolveEngine engine; - private ResolveData _data; + private ResolveData data; @Before public void setUp() { - _settings = new IvySettings(); - _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _data = new ResolveData(_engine, new ResolveOptions()); - _settings.setDefaultCache(TestHelper.cache); + settings = new IvySettings(); + engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); + data = new ResolveData(engine, new ResolveOptions()); + settings.setDefaultCache(TestHelper.cache); } @After @@ -137,11 +137,11 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { @Test public void testBintray() throws Exception { BintrayResolver resolver = new BintrayResolver(); - resolver.setSettings(_settings); + resolver.setSettings(settings); ModuleRevisionId mrid = ModuleRevisionId .newInstance("org.apache.ant", "ant-antunit", "1.2"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, - false), _data); + false), data); assertNotNull(rmr); assertEquals(mrid, rmr.getId()); @@ -178,7 +178,7 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { resolver.setRepo("unknown"); resolver.setName("test"); resolver.setM2compatible(true); - resolver.setSettings(_settings); + resolver.setSettings(settings); assertEquals("test", resolver.getName()); MockMessageLogger mockMessageImpl = new MockMessageLogger(); @@ -187,7 +187,7 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "commons-fileupload", "1.0"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, - false), _data); + false), data); assertNull(rmr); mockMessageImpl @@ -200,7 +200,7 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { public void testBintrayArtifacts() throws Exception { BintrayResolver resolver = new BintrayResolver(); resolver.setName("test"); - resolver.setSettings(_settings); + resolver.setSettings(settings); assertEquals("test", resolver.getName()); ModuleRevisionId mrid = ModuleRevisionId @@ -210,7 +210,7 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { "ant-antunit", "javadoc", "jar"), ExactPatternMatcher.INSTANCE, null)); dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), "ant-antunit", "sources", "jar"), ExactPatternMatcher.INSTANCE, null)); - ResolvedModuleRevision rmr = resolver.getDependency(dd, _data); + ResolvedModuleRevision rmr = resolver.getDependency(dd, data); assertNotNull(rmr); assertEquals(mrid, rmr.getId()); @@ -259,11 +259,11 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { public void testUnknown() throws Exception { BintrayResolver resolver = new BintrayResolver(); resolver.setName("test"); - resolver.setSettings(_settings); + resolver.setSettings(settings); assertNull(resolver.getDependency( new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("unknown", "unknown", - "1.0"), false), _data)); + "1.0"), false), data)); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java index 7a035fe..e4cbff4 100644 --- a/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java @@ -46,30 +46,30 @@ import static org.junit.Assert.assertTrue; * Test for DualResolver */ public class DualResolverTest extends AbstractDependencyResolverTest { - private IvySettings _settings; + private IvySettings settings; - private ResolveEngine _engine; + private ResolveEngine engine; - private ResolveData _data; + private ResolveData data; - private File _cache; + private File cache; @Before public void setUp() { - _settings = new IvySettings(); - _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _cache = new File("build/cache"); - _data = new ResolveData(_engine, new ResolveOptions()); - _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()); + cache.mkdirs(); + settings.setDefaultCache(cache); } @Test public void testFromConf() throws Exception { - new XmlSettingsParser(_settings).parse(DualResolverTest.class + new XmlSettingsParser(settings).parse(DualResolverTest.class .getResource("dualresolverconf.xml")); - DependencyResolver resolver = _settings.getResolver("dualok"); + DependencyResolver resolver = settings.getResolver("dualok"); assertNotNull(resolver); assertTrue(resolver instanceof DualResolver); DualResolver dual = (DualResolver) resolver; @@ -78,7 +78,7 @@ public class DualResolverTest extends AbstractDependencyResolverTest { assertNotNull(dual.getArtifactResolver()); assertEquals("artifact", dual.getArtifactResolver().getName()); - resolver = _settings.getResolver("dualnotenough"); + resolver = settings.getResolver("dualnotenough"); assertNotNull(resolver); assertTrue(resolver instanceof DualResolver); dual = (DualResolver) resolver; @@ -94,7 +94,7 @@ public class DualResolverTest extends AbstractDependencyResolverTest { */ @Test(expected = ParseException.class) public void testFromBadConf() throws IOException, ParseException { - new XmlSettingsParser(_settings).parse(DualResolverTest.class + new XmlSettingsParser(settings).parse(DualResolverTest.class .getResource("dualresolverconf-bad.xml")); } @@ -109,21 +109,21 @@ public class DualResolverTest extends AbstractDependencyResolverTest { dual.setIvyResolver(new IBiblioResolver()); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( ModuleRevisionId.newInstance("org", "mod", "rev"), false); - dual.getDependency(dd, _data); + dual.getDependency(dd, data); } @Test public void testResolve() throws Exception { DualResolver dual = new DualResolver(); - MockResolver ivyResolver = MockResolver.buildMockResolver(_settings, "ivy", true, + MockResolver ivyResolver = MockResolver.buildMockResolver(settings, "ivy", true, new GregorianCalendar(2005, 1, 20).getTime()); - MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", + 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); - ResolvedModuleRevision rmr = dual.getDependency(dd, _data); + ResolvedModuleRevision rmr = dual.getDependency(dd, data); assertNotNull(rmr); assertEquals(dual, rmr.getArtifactResolver()); @@ -134,15 +134,15 @@ public class DualResolverTest extends AbstractDependencyResolverTest { @Test public void testResolveFromArtifact() throws Exception { DualResolver dual = new DualResolver(); - MockResolver ivyResolver = MockResolver.buildMockResolver(_settings, "ivy", false, + MockResolver ivyResolver = MockResolver.buildMockResolver(settings, "ivy", false, new GregorianCalendar(2005, 1, 20).getTime()); - MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", true, + MockResolver artifactResolver = MockResolver.buildMockResolver(settings, "artifact", true, new GregorianCalendar(2005, 1, 20).getTime()); dual.setIvyResolver(ivyResolver); dual.setArtifactResolver(artifactResolver); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( ModuleRevisionId.newInstance("org", "mod", "rev"), false); - ResolvedModuleRevision rmr = dual.getDependency(dd, _data); + ResolvedModuleRevision rmr = dual.getDependency(dd, data); assertNotNull(rmr); assertEquals(artifactResolver, rmr.getResolver()); @@ -153,15 +153,15 @@ public class DualResolverTest extends AbstractDependencyResolverTest { @Test public void testResolveFail() throws Exception { DualResolver dual = new DualResolver(); - MockResolver ivyResolver = MockResolver.buildMockResolver(_settings, "ivy", false, + MockResolver ivyResolver = MockResolver.buildMockResolver(settings, "ivy", false, new GregorianCalendar(2005, 1, 20).getTime()); - MockResolver artifactResolver = MockResolver.buildMockResolver(_settings, "artifact", + 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); - ResolvedModuleRevision rmr = dual.getDependency(dd, _data); + ResolvedModuleRevision rmr = dual.getDependency(dd, data); assertNull(rmr); assertEquals(Collections. singletonList(dd), ivyResolver.askedDeps); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/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 d36a030..88e5da0 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java @@ -55,19 +55,19 @@ import org.junit.Test; public class IBiblioResolverTest extends AbstractDependencyResolverTest { // remote.test - private IvySettings _settings; + private IvySettings settings; - private ResolveEngine _engine; + private ResolveEngine engine; - private ResolveData _data; + private ResolveData data; @Before public void setUp() { - _settings = new IvySettings(); - _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _data = new ResolveData(_engine, new ResolveOptions()); + settings = new IvySettings(); + engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); + data = new ResolveData(engine, new ResolveOptions()); TestHelper.createCache(); - _settings.setDefaultCache(TestHelper.cache); + settings.setDefaultCache(TestHelper.cache); } @After @@ -78,11 +78,11 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { @Test public void testDefaults() { IBiblioResolver resolver = new IBiblioResolver(); - _settings.setVariable("ivy.ibiblio.default.artifact.root", + settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/mymaven/"); - _settings.setVariable("ivy.ibiblio.default.artifact.pattern", + settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); - resolver.setSettings(_settings); + resolver.setSettings(settings); List l = resolver.getArtifactPatterns(); assertNotNull(l); assertEquals(1, l.size()); @@ -92,20 +92,20 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { @Test public void testInitFromConf() throws Exception { - _settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/maven/"); - _settings.setVariable("ivy.ibiblio.default.artifact.pattern", + settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/maven/"); + settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); - _settings.setVariable("my.ibiblio.root", "http://www.ibiblio.org/mymaven/"); - _settings.setVariable("my.ibiblio.pattern", "[module]/[artifact]-[revision].jar"); - _settings.load(IBiblioResolverTest.class.getResource("ibiblioresolverconf.xml")); - IBiblioResolver resolver = (IBiblioResolver) _settings.getResolver("ibiblioA"); + settings.setVariable("my.ibiblio.root", "http://www.ibiblio.org/mymaven/"); + settings.setVariable("my.ibiblio.pattern", "[module]/[artifact]-[revision].jar"); + settings.load(IBiblioResolverTest.class.getResource("ibiblioresolverconf.xml")); + IBiblioResolver resolver = (IBiblioResolver) settings.getResolver("ibiblioA"); assertNotNull(resolver); List l = resolver.getArtifactPatterns(); assertNotNull(l); assertEquals(1, l.size()); assertEquals("http://www.ibiblio.org/mymaven/[module]/[artifact]-[revision].jar", l.get(0)); - resolver = (IBiblioResolver) _settings.getResolver("ibiblioB"); + resolver = (IBiblioResolver) settings.getResolver("ibiblioB"); assertNotNull(resolver); l = resolver.getArtifactPatterns(); assertNotNull(l); @@ -113,7 +113,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { assertEquals("http://www.ibiblio.org/mymaven/[organisation]/jars/[artifact]-[revision].jar", l.get(0)); - resolver = (IBiblioResolver) _settings.getResolver("ibiblioC"); + resolver = (IBiblioResolver) settings.getResolver("ibiblioC"); assertTrue(resolver.isM2compatible()); assertNotNull(resolver); l = resolver.getArtifactPatterns(); @@ -123,7 +123,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { "https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", l.get(0)); - resolver = (IBiblioResolver) _settings.getResolver("ibiblioD"); + resolver = (IBiblioResolver) settings.getResolver("ibiblioD"); assertFalse(resolver.isM2compatible()); assertNotNull(resolver); l = resolver.getArtifactPatterns(); @@ -132,7 +132,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { assertEquals("http://www.ibiblio.org/maven/[module]/jars/[artifact]-[revision].jar", l.get(0)); - resolver = (IBiblioResolver) _settings.getResolver("ibiblioE"); + resolver = (IBiblioResolver) settings.getResolver("ibiblioE"); assertTrue(resolver.isM2compatible()); assertNotNull(resolver); l = resolver.getArtifactPatterns(); @@ -142,7 +142,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { "http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", l.get(0)); - resolver = (IBiblioResolver) _settings.getResolver("ibiblioF"); + resolver = (IBiblioResolver) settings.getResolver("ibiblioF"); assertTrue(resolver.isM2compatible()); assertNotNull(resolver); l = resolver.getArtifactPatterns(); @@ -158,7 +158,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { public void testMaven2Listing() throws Exception { IBiblioResolver resolver = new IBiblioResolver(); resolver.setName("test"); - resolver.setSettings(_settings); + resolver.setSettings(settings); resolver.setM2compatible(true); assertEquals("test", resolver.getName()); @@ -195,7 +195,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { resolver.setRoot("http://unknown.host.comx/"); resolver.setName("test"); resolver.setM2compatible(true); - resolver.setSettings(_settings); + resolver.setSettings(settings); assertEquals("test", resolver.getName()); MockMessageLogger mockMessageImpl = new MockMessageLogger(); @@ -204,7 +204,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "commons-fileupload", "1.0"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, - false), _data); + false), data); assertNull(rmr); mockMessageImpl http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java index bce5415..8734c2c 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java @@ -48,22 +48,22 @@ import org.junit.rules.ExpectedException; * */ public class IvyRepResolverTest extends AbstractDependencyResolverTest { - private IvySettings _settings; + private IvySettings settings; - private ResolveEngine _engine; + private ResolveEngine engine; - private ResolveData _data; + private ResolveData data; @Rule public ExpectedException expExc = ExpectedException.none(); @Before public void setUp() { - _settings = new IvySettings(); - _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _data = new ResolveData(_engine, new ResolveOptions()); + settings = new IvySettings(); + engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); + data = new ResolveData(engine, new ResolveOptions()); TestHelper.createCache(); - _settings.setDefaultCache(TestHelper.cache); + settings.setDefaultCache(TestHelper.cache); } @After @@ -74,14 +74,14 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest { @Test public void testDefaults() { IvyRepResolver resolver = new IvyRepResolver(); - _settings.setVariable("ivy.ivyrep.default.ivy.root", "http://www.jayasoft.fr/myivyrep/"); - _settings.setVariable("ivy.ivyrep.default.ivy.pattern", + settings.setVariable("ivy.ivyrep.default.ivy.root", "http://www.jayasoft.fr/myivyrep/"); + settings.setVariable("ivy.ivyrep.default.ivy.pattern", "[organisation]/[module]/ivy-[revision].[ext]"); - _settings.setVariable("ivy.ivyrep.default.artifact.root", + settings.setVariable("ivy.ivyrep.default.artifact.root", "http://www.ibiblio.org/mymaven/"); - _settings.setVariable("ivy.ivyrep.default.artifact.pattern", + settings.setVariable("ivy.ivyrep.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar"); - resolver.setSettings(_settings); + resolver.setSettings(settings); List l = resolver.getIvyPatterns(); assertNotNull(l); assertEquals(1, l.size()); @@ -107,11 +107,11 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest { IvyRepResolver resolver = new IvyRepResolver(); resolver.setName("test"); - resolver.setSettings(_settings); + resolver.setSettings(settings); ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-cli", "1.0"); - resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data); + resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), data); } @Test @@ -124,11 +124,11 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest { resolver.setIvypattern("[organisation]/[module]/ivys/ivy-[revision].xml"); resolver.setArtroot("file:" + rootpath); resolver.setArtpattern("[organisation]/[module]/jars/[artifact]-[revision].[ext]"); - resolver.setSettings(_settings); + resolver.setSettings(settings); ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"); ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, - false), _data); + false), data); assertNotNull(rmr); DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "mod1.1", http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/util/ConfiguratorTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/ConfiguratorTest.java b/test/java/org/apache/ivy/util/ConfiguratorTest.java index 5329985..6cc532d 100644 --- a/test/java/org/apache/ivy/util/ConfiguratorTest.java +++ b/test/java/org/apache/ivy/util/ConfiguratorTest.java @@ -46,98 +46,98 @@ public class ConfiguratorTest { } public static class City { - private final List _housings = new ArrayList<>(); + private final List housings = new ArrayList<>(); - private final List _streets = new ArrayList<>(); + private final List streets = new ArrayList<>(); - private String _name; + private String name; public String getName() { - return _name; + return name; } public void setName(String name) { - _name = name; + this.name = name; } public List getHousings() { - return _housings; + return housings; } public List getStreets() { - return _streets; + return streets; } public void add(Housing h) { - _housings.add(h); + housings.add(h); } public void add(Street s) { - _streets.add(s); + streets.add(s); } } public static class Street { - private Class _clazz; + private Class clazz; - private final List _trees = new ArrayList<>(); + private final List trees = new ArrayList<>(); - private final List _walkers = new ArrayList<>(); + private final List walkers = new ArrayList<>(); public List getTrees() { - return _trees; + return trees; } public void addConfiguredTree(Tree tree) { - _trees.add(tree); + trees.add(tree); } public List getWalkers() { - return _walkers; + return walkers; } public void addConfiguredWalker(Map walkerAttributes) { - _walkers.add(new Person(walkerAttributes.get("name"))); + walkers.add(new Person(walkerAttributes.get("name"))); } public Class getClazz() { - return _clazz; + return clazz; } public void setClazz(Class clazz) { - _clazz = clazz; + this.clazz = clazz; } } public abstract static class Housing { - private final List _rooms = new ArrayList<>(); + private final List rooms = new ArrayList<>(); - private boolean _isEmpty; + private boolean isEmpty; - private Person _proprietary; + private Person proprietary; public List getRooms() { - return _rooms; + return rooms; } public void addRoom(Room r) { - _rooms.add(r); + rooms.add(r); } public boolean isEmpty() { - return _isEmpty; + return isEmpty; } public void setEmpty(boolean isEmpty) { - _isEmpty = isEmpty; + this.isEmpty = isEmpty; } public Person getProprietary() { - return _proprietary; + return proprietary; } public void setProprietary(Person proprietary) { - _proprietary = proprietary; + this.proprietary = proprietary; } } @@ -145,190 +145,190 @@ public class ConfiguratorTest { } public static class Tree { - private short _age; + private short age; public short getAge() { - return _age; + return age; } public void setAge(short age) { - _age = age; + this.age = age; } } public static class Flat extends Housing { - private int _stage; + private int stage; public int getStage() { - return _stage; + return stage; } public void setStage(int stage) { - _stage = stage; + this.stage = stage; } } public static class Room { - private short _surface; + private short surface; public short getSurface() { - return _surface; + return surface; } public void setSurface(short surface) { - _surface = surface; + this.surface = surface; } } public static class Person { - private final String _name; + private final String name; public Person(String name) { - _name = name; + this.name = name; } public String getName() { - return _name; + return name; } } - private Configurator _conf; + private Configurator conf; @Before public void setUp() { - _conf = new Configurator(); + conf = new Configurator(); } @Test public void testSetRoot() { City city = new City(); - _conf.setRoot(city); - assertEquals(city, _conf.getCurrent()); + conf.setRoot(city); + assertEquals(city, conf.getCurrent()); } @Test public void testStringAttribute() { City city = new City(); - _conf.setRoot(city); - _conf.setAttribute("name", "bordeaux"); + conf.setRoot(city); + conf.setAttribute("name", "bordeaux"); assertEquals("bordeaux", city.getName()); } @Test public void testIntAttribute() { Flat flat = new Flat(); - _conf.setRoot(flat); - _conf.setAttribute("stage", "4"); + conf.setRoot(flat); + conf.setAttribute("stage", "4"); assertEquals(4, flat.getStage()); } @Test public void testBooleanAttribute() { Housing housing = new House(); - _conf.setRoot(housing); - _conf.setAttribute("empty", "true"); + conf.setRoot(housing); + conf.setAttribute("empty", "true"); assertEquals(true, housing.isEmpty()); - _conf.setAttribute("empty", "false"); + conf.setAttribute("empty", "false"); assertEquals(false, housing.isEmpty()); - _conf.setAttribute("empty", "yes"); + conf.setAttribute("empty", "yes"); assertEquals(true, housing.isEmpty()); - _conf.setAttribute("empty", "no"); + conf.setAttribute("empty", "no"); assertEquals(false, housing.isEmpty()); - _conf.setAttribute("empty", "on"); + conf.setAttribute("empty", "on"); assertEquals(true, housing.isEmpty()); - _conf.setAttribute("empty", "off"); + conf.setAttribute("empty", "off"); assertEquals(false, housing.isEmpty()); } @Test public void testClassAttribute() { Street street = new Street(); - _conf.setRoot(street); - _conf.setAttribute("clazz", getClass().getName()); + conf.setRoot(street); + conf.setAttribute("clazz", getClass().getName()); assertEquals(getClass(), street.getClazz()); } @Test public void testPersonAttribute() { Housing housing = new House(); - _conf.setRoot(housing); - _conf.setAttribute("proprietary", "jean"); + conf.setRoot(housing); + conf.setAttribute("proprietary", "jean"); assertEquals("jean", housing.getProprietary().getName()); } @Test public void testAddRoom() { Housing housing = new House(); - _conf.setRoot(housing); - _conf.startCreateChild("room"); + conf.setRoot(housing); + conf.startCreateChild("room"); assertEquals(1, housing.getRooms().size()); - _conf.setAttribute("surface", "24"); + conf.setAttribute("surface", "24"); assertEquals(24, housing.getRooms().get(0).getSurface()); - _conf.endCreateChild(); - assertEquals(housing, _conf.getCurrent()); + conf.endCreateChild(); + assertEquals(housing, conf.getCurrent()); } @Test public void testAddConfiguredTree() { Street street = new Street(); - _conf.setRoot(street); - _conf.startCreateChild("tree"); + conf.setRoot(street); + conf.startCreateChild("tree"); assertTrue(street.getTrees().isEmpty()); - _conf.setAttribute("age", "400"); - _conf.endCreateChild(); + conf.setAttribute("age", "400"); + conf.endCreateChild(); assertEquals(1, street.getTrees().size()); assertEquals(400, street.getTrees().get(0).getAge()); - assertEquals(street, _conf.getCurrent()); + assertEquals(street, conf.getCurrent()); } @Test public void testAddConfiguredWalker() { Street street = new Street(); - _conf.setRoot(street); - _conf.startCreateChild("walker"); + conf.setRoot(street); + conf.startCreateChild("walker"); assertTrue(street.getWalkers().isEmpty()); - _conf.setAttribute("name", "xavier"); - _conf.endCreateChild(); + conf.setAttribute("name", "xavier"); + conf.endCreateChild(); assertEquals(1, street.getWalkers().size()); assertEquals("xavier", street.getWalkers().get(0).getName()); - assertEquals(street, _conf.getCurrent()); + assertEquals(street, conf.getCurrent()); } @Test 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"); + 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(); - _conf.startCreateChild("flat"); + conf.endCreateChild(); + conf.startCreateChild("flat"); assertEquals(2, city.getHousings().size()); assertTrue(city.getHousings().get(1) instanceof Flat); - _conf.endCreateChild(); - _conf.startCreateChild("street"); + conf.endCreateChild(); + conf.startCreateChild("street"); assertEquals(1, city.getStreets().size()); - _conf.endCreateChild(); - assertEquals(city, _conf.getCurrent()); + conf.endCreateChild(); + assertEquals(city, conf.getCurrent()); } @Test public void testNested() throws Exception { City city = new City(); - _conf.typeDef("house", House.class.getName()); - _conf.setRoot(city); - _conf.startCreateChild("house"); - _conf.startCreateChild("room"); - _conf.setAttribute("surface", "20"); - _conf.endCreateChild(); - _conf.startCreateChild("room"); - _conf.setAttribute("surface", "25"); - _conf.endCreateChild(); - _conf.endCreateChild(); - assertEquals(city, _conf.getCurrent()); + conf.typeDef("house", House.class.getName()); + conf.setRoot(city); + conf.startCreateChild("house"); + conf.startCreateChild("room"); + conf.setAttribute("surface", "20"); + conf.endCreateChild(); + conf.startCreateChild("room"); + conf.setAttribute("surface", "25"); + conf.endCreateChild(); + conf.endCreateChild(); + assertEquals(city, conf.getCurrent()); assertEquals(2, city.getHousings().get(0).getRooms().size()); assertEquals(20, city.getHousings().get(0).getRooms().get(0).getSurface()); assertEquals(25, city.getHousings().get(0).getRooms().get(1).getSurface()); @@ -337,37 +337,37 @@ public class ConfiguratorTest { @Test 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); - _conf.startCreateChild("house"); - _conf.startCreateChild("room"); - _conf.setAttribute("surface", "@{surface}"); - _conf.endCreateChild(); - _conf.startCreateChild("room"); - _conf.setAttribute("surface", "@{surface}"); - _conf.endCreateChild(); - _conf.startCreateChild("addroom"); - _conf.endCreateChild(); - _conf.endCreateChild(); - _conf.endMacroDef(); - - _conf.setRoot(city); - _conf.startCreateChild("castle"); - _conf.setAttribute("surface", "10"); - _conf.endCreateChild(); - - _conf.startCreateChild("castle"); - _conf.startCreateChild("addroom"); - _conf.startCreateChild("room"); - _conf.setAttribute("surface", "20"); - _conf.endCreateChild(); - _conf.endCreateChild(); - _conf.endCreateChild(); - - assertEquals(city, _conf.getCurrent()); + conf.typeDef("house", House.class.getName()); + + conf.startMacroDef("castle"); + conf.addMacroAttribute("surface", "40"); + conf.addMacroElement("addroom", true); + conf.startCreateChild("house"); + conf.startCreateChild("room"); + conf.setAttribute("surface", "@{surface}"); + conf.endCreateChild(); + conf.startCreateChild("room"); + conf.setAttribute("surface", "@{surface}"); + conf.endCreateChild(); + conf.startCreateChild("addroom"); + conf.endCreateChild(); + conf.endCreateChild(); + conf.endMacroDef(); + + conf.setRoot(city); + conf.startCreateChild("castle"); + conf.setAttribute("surface", "10"); + conf.endCreateChild(); + + conf.startCreateChild("castle"); + conf.startCreateChild("addroom"); + conf.startCreateChild("room"); + conf.setAttribute("surface", "20"); + conf.endCreateChild(); + conf.endCreateChild(); + conf.endCreateChild(); + + assertEquals(city, conf.getCurrent()); assertEquals(2, city.getHousings().size()); // first castle : 2 default rooms of 10 of surface @@ -385,8 +385,8 @@ public class ConfiguratorTest { @Test public void testFileAttribute() { FileTester root = new FileTester(); - _conf.setRoot(root); - _conf.setAttribute("file", "path/to/file.txt"); + conf.setRoot(root); + conf.setAttribute("file", "path/to/file.txt"); String filePath = root.getFile().getPath(); filePath = filePath.replace('\\', '/'); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9a686e73/test/java/org/apache/ivy/util/MockMessageLogger.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/MockMessageLogger.java b/test/java/org/apache/ivy/util/MockMessageLogger.java index ce4c6cb..85dfdd6 100644 --- a/test/java/org/apache/ivy/util/MockMessageLogger.java +++ b/test/java/org/apache/ivy/util/MockMessageLogger.java @@ -22,69 +22,69 @@ import java.util.List; public class MockMessageLogger extends AbstractMessageLogger { - private final List _endProgress = new ArrayList<>(); + private final List endProgress = new ArrayList<>(); - private final List _logs = new ArrayList<>(); + private final List logs = new ArrayList<>(); - private final List _rawLogs = new ArrayList<>(); + private final List rawLogs = new ArrayList<>(); - private int _progressCalls; + private int progressCalls; public void doEndProgress(String msg) { - _endProgress.add(msg); + endProgress.add(msg); } public void log(String msg, int level) { - _logs.add(level + " " + msg); + logs.add(level + " " + msg); } public void doProgress() { - _progressCalls++; + progressCalls++; } public void rawlog(String msg, int level) { - _rawLogs.add(level + " " + msg); + rawLogs.add(level + " " + msg); } public List getEndProgress() { - return _endProgress; + return endProgress; } public List getLogs() { - return _logs; + return logs; } public int getProgressCalls() { - return _progressCalls; + return progressCalls; } public List getRawLogs() { - return _rawLogs; + return rawLogs; } public void clear() { super.clearProblems(); - _logs.clear(); - _rawLogs.clear(); - _endProgress.clear(); - _progressCalls = 0; + logs.clear(); + rawLogs.clear(); + endProgress.clear(); + progressCalls = 0; } public void assertLogContains(String message) { - for (String log : _logs) { + for (String log : logs) { if (log.contains(message)) { return; } } throw new AssertionError("logs do not contain expected message: expected='" + message - + "' logs='\n" + join(_logs) + "'"); + + "' logs='\n" + join(logs) + "'"); } public void assertLogDoesntContain(String message) { - for (String log : _logs) { + for (String log : logs) { if (log.contains(message)) { throw new AssertionError("logs contain unexpected message: '" + message - + "' logs='\n" + join(_logs) + "'"); + + "' logs='\n" + join(logs) + "'"); } } }