Repository: ant-ivy Updated Branches: refs/heads/master da69323b2 -> 36e99429c
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java index e5380ea..a7ad5ec 100644 --- a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java @@ -41,6 +41,13 @@ import org.apache.ivy.core.resolve.ResolvedModuleRevision; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.plugins.matcher.ExactPatternMatcher; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * Tests URLResolver. Http tests are based upon ibiblio site. @@ -53,7 +60,8 @@ public class URLResolverTest extends AbstractDependencyResolverTest { private ResolveData data; - protected void setUp() throws Exception { + @Before + public void setUp() { settings = new IvySettings(); engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); data = new ResolveData(engine, new ResolveOptions()); @@ -61,10 +69,12 @@ public class URLResolverTest extends AbstractDependencyResolverTest { settings.setDefaultCache(TestHelper.cache); } - protected void tearDown() throws Exception { + @After + public void tearDown() { TestHelper.cleanCache(); } + @Test public void testFile() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(settings); @@ -110,6 +120,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } + @Test public void testLatestFile() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(settings); @@ -130,6 +141,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals(pubdate, rmr.getPublicationDate()); } + @Test public void testLatestFileWithOpaqueURL() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(settings); @@ -151,6 +163,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals(pubdate, rmr.getPublicationDate()); } + @Test public void testIBiblio() throws Exception { String ibiblioRoot = IBiblioHelper.getIBiblioMirror(); if (ibiblioRoot == null) { @@ -195,6 +208,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } + @Test public void testIBiblioArtifacts() throws Exception { String ibiblioRoot = IBiblioHelper.getIBiblioMirror(); if (ibiblioRoot == null) { @@ -258,6 +272,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } + @Test public void testLatestIBiblio() throws Exception { String ibiblioRoot = IBiblioHelper.getIBiblioMirror(); if (ibiblioRoot == null) { @@ -277,6 +292,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals("1.4.3", rmr.getId().getRevision()); } + @Test public void testVersionRangeIBiblio() throws Exception { String ibiblioRoot = IBiblioHelper.getIBiblioMirror(); if (ibiblioRoot == null) { @@ -298,6 +314,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { assertEquals("1.4.4", rmr.getId().getRevision()); } + @Test public void testUnknown() throws Exception { String ibiblioRoot = IBiblioHelper.getIBiblioMirror(); if (ibiblioRoot == null) { @@ -316,6 +333,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { "1.0"), false), data)); } + @Test public void testDownloadWithUseOriginIsTrue() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(settings); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java index a1a528a..cff4a81 100644 --- a/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java @@ -17,21 +17,31 @@ */ package org.apache.ivy.plugins.resolver; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + public class VfsResolverTest extends AbstractDependencyResolverTest { VfsResolver resolver = null; + @Before public void setUp() { resolver = new VfsResolver(); } + @After public void tearDown() { resolver = null; } + @Test public void testInit() { assertEquals(resolver.getClass(), VfsResolver.class); } + @Test public void testTypeName() { assertEquals(resolver.getTypeName(), "vfs"); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java b/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java index 4d6bc67..ab019ad 100644 --- a/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java @@ -22,10 +22,14 @@ import java.util.Arrays; import org.apache.ivy.plugins.repository.file.FileRepository; -import junit.framework.TestCase; +import org.junit.Test; -public class ResolverHelperTest extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +public class ResolverHelperTest { + + @Test public void testListTokenValuesForIvy1238() { FileRepository rep = new FileRepository(new File(".").getAbsoluteFile()); String[] revisions = ResolverHelper.listTokenValues(rep, http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java index 884c9be..a10191b 100644 --- a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java +++ b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java @@ -26,10 +26,14 @@ import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.Message; import org.apache.ivy.util.MockMessageLogger; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -public class LogTriggerTest extends TestCase { +public class LogTriggerTest { private static final String LINE_SEPARATOR = System.getProperty("line.separator"); private StartResolveEvent ev; @@ -38,7 +42,8 @@ public class LogTriggerTest extends TestCase { private File testDir; - protected void setUp() { + @Before + public void setUp() { ev = new StartResolveEvent(DefaultModuleDescriptor.newBasicInstance( ModuleRevisionId.parse("o#A;1"), new Date()), new String[] {"c"}); trigger = new LogTrigger(); @@ -47,10 +52,12 @@ public class LogTriggerTest extends TestCase { testDir.mkdirs(); } - protected void tearDown() throws Exception { + @After + public void tearDown() { FileUtil.forceDelete(testDir); } + @Test public void testMessage() throws Exception { trigger.setMessage("msg: ${organisation} ${module} ${revision}"); @@ -61,6 +68,7 @@ public class LogTriggerTest extends TestCase { mockLogger.assertLogInfoContains("msg: o A 1"); } + @Test public void testFile() throws Exception { trigger.setMessage("msg: ${organisation} ${module} ${revision}"); File f = new File(testDir, "test.log"); @@ -77,6 +85,7 @@ public class LogTriggerTest extends TestCase { FileUtil.readEntirely(f)); } + @Test public void testFileNoAppend() throws Exception { trigger.setMessage("msg: ${organisation} ${module} ${revision}"); File f = new File(testDir, "test.log"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java index 5997e83..0b027dd 100644 --- a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java @@ -22,26 +22,33 @@ import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.module.status.Status; import org.apache.ivy.core.module.status.StatusManager; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -public class LatestVersionMatcherTest extends TestCase { - private LatestVersionMatcher vm = new LatestVersionMatcher(); +public class LatestVersionMatcherTest { + private final LatestVersionMatcher vm = new LatestVersionMatcher(); - protected void setUp() { + @Before + public void setUp() { IvyContext.pushNewContext(); } - protected void tearDown() { + @After + public void tearDown() { IvyContext.popContext(); } + @Test public void testNeedModuleDescriptorStandardStatus() throws Exception { assertNeed("latest.release", true); assertNeed("latest.milestone", true); assertNeed("latest.integration", false); } + @Test public void testNeedModuleDescriptorCustomStatus() throws Exception { StatusManager.getCurrent().addStatus(new Status("release", false)); StatusManager.getCurrent().addStatus(new Status("snapshot", true)); @@ -50,18 +57,21 @@ public class LatestVersionMatcherTest extends TestCase { assertNeed("latest.snapshot", false); } + @Test public void testAcceptForStandardStatus() throws Exception { assertAccept("latest.release", "release", true); assertAccept("latest.release", "milestone", false); assertAccept("latest.release", "integration", false); } + @Test public void testAcceptForSameBranches() throws Exception { assertAccept("latest.release", "trunk", "release", "trunk", true); assertAccept("latest.release", "trunk", "milestone", "trunk", false); assertAccept("latest.release", "trunk", "integration", "trunk", false); } + @Test public void testAcceptForDifferentBranches() throws Exception { assertAccept("latest.release", "trunk", "release", "feature", false); assertAccept("latest.release", "trunk", "milestone", "feature", false); @@ -74,6 +84,7 @@ public class LatestVersionMatcherTest extends TestCase { ModuleRevisionId.newInstance("org", "name", askedVersion), null)); } + @SuppressWarnings("unused") private void assertNeed(String askedVersion, String askedBranch, boolean b) { assertEquals(b, vm.needModuleDescriptor( ModuleRevisionId.newInstance("org", "name", askedBranch, askedVersion), null)); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java index 1450326..8baa381 100644 --- a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java @@ -18,10 +18,12 @@ package org.apache.ivy.plugins.version; import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.junit.Test; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -public class PatternVersionMatcherTest extends TestCase { +public class PatternVersionMatcherTest { + @Test public void testSingleMatch() { PatternVersionMatcher pvm = new PatternVersionMatcher(); pvm.addMatch(generateRegexpMatch1()); @@ -33,6 +35,7 @@ public class PatternVersionMatcherTest extends TestCase { assertAccept(pvm, "foo(1,3)", "1.3.1", true); } + @Test public void testMultipleMatchEqualRevisions() { PatternVersionMatcher pvm = new PatternVersionMatcher(); pvm.addMatch(generateRegexpMatch1()); @@ -42,6 +45,7 @@ public class PatternVersionMatcherTest extends TestCase { assertAccept(pvm, "foo(1,3)", "1.3.1", true); } + @Test public void testMultipleMatchNonEqualRevisions() { PatternVersionMatcher pvm = new PatternVersionMatcher(); pvm.addMatch(generateRegexpMatch1()); @@ -56,7 +60,7 @@ public class PatternVersionMatcherTest extends TestCase { * Generates a Match instance that has the following xml representation: <match revision="foo" * pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" /> * - * @return + * @return Match */ private Match generateRegexpMatch1() { Match match = new Match(); @@ -72,7 +76,7 @@ public class PatternVersionMatcherTest extends TestCase { * Generates a Match instance that has the following xml representation: <match revision="foo" * pattern="${major}\.${minor}" args="major, minor" matcher="regexp" /> * - * @return + * @return Match */ private Match generateRegexpMatch2() { Match match = new Match(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java index 0e1e8d1..1abfe1a 100644 --- a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java @@ -19,12 +19,14 @@ package org.apache.ivy.plugins.version; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.plugins.latest.LatestRevisionStrategy; +import org.junit.Test; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -public class VersionRangeMatcherTest extends TestCase { - VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy()); +public class VersionRangeMatcherTest { + final VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy()); + @Test public void testMavenExcludeParenthesis() throws Exception { assertAccept("[3.8,4.0)", "3.7", false); assertAccept("[3.8,4.0)", "3.8", true); @@ -45,6 +47,7 @@ public class VersionRangeMatcherTest extends TestCase { assertAccept("(3.8,4.0)", "4.1", false); } + @Test public void testDynamic() { assertDynamic("lastest.integration", false); assertDynamic("[1.0]", false); @@ -86,6 +89,7 @@ public class VersionRangeMatcherTest extends TestCase { assertDynamic("( , 1.0 ]", true); } + @Test public void testIncludingFinite() { assertAccept("[1.0,2.0]", "1.1", true); assertAccept("[1.0,2.0]", "0.9", false); @@ -100,6 +104,7 @@ public class VersionRangeMatcherTest extends TestCase { assertAccept("[ 1.0 , 2.0 ]", "2.0", true); } + @Test public void testExcludingFinite() { assertAccept("]1.0,2.0[", "1.1", true); assertAccept("]1.0,2.0[", "0.9", false); @@ -114,6 +119,7 @@ public class VersionRangeMatcherTest extends TestCase { assertAccept("]1.0,2.0]", "2.0", true); } + @Test public void testIncludingInfinite() { assertAccept("[1.0,)", "1.1", true); assertAccept("[1.0,)", "2.0", true); @@ -135,6 +141,7 @@ public class VersionRangeMatcherTest extends TestCase { assertAccept("[ 1.0, )", "1.0", true); } + @Test public void testExcludingInfinite() { assertAccept("]1.0,)", "1.1", true); assertAccept("]1.0,)", "2.0", true); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/CacheCleaner.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/CacheCleaner.java b/test/java/org/apache/ivy/util/CacheCleaner.java index 43e7355..00e4acc 100644 --- a/test/java/org/apache/ivy/util/CacheCleaner.java +++ b/test/java/org/apache/ivy/util/CacheCleaner.java @@ -23,7 +23,7 @@ public class CacheCleaner { /** * Delete the directory and all it contains. Previously, we used the ant delete task, but it - * occasionaly failed (access denied) on my machine for unknown reason. + * occasionally failed (access denied) on my machine for unknown reason. **/ public static void deleteDir(File toDelete) { FileUtil.forceDelete(toDelete); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/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 b28e3d8..ba642c0 100644 --- a/test/java/org/apache/ivy/util/ConfiguratorTest.java +++ b/test/java/org/apache/ivy/util/ConfiguratorTest.java @@ -17,17 +17,21 @@ */ package org.apache.ivy.util; +import org.junit.Before; +import org.junit.Test; + import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * */ -public class ConfiguratorTest extends TestCase { +public class ConfiguratorTest { public static class FileTester { private File file; @@ -42,9 +46,9 @@ public class ConfiguratorTest extends TestCase { } public static class City { - private List _housings = new ArrayList(); + private final List<Housing> _housings = new ArrayList<Housing>(); - private List _streets = new ArrayList(); + private final List<Street> _streets = new ArrayList<Street>(); private String _name; @@ -56,11 +60,11 @@ public class ConfiguratorTest extends TestCase { _name = name; } - public List getHousings() { + public List<Housing> getHousings() { return _housings; } - public List getStreets() { + public List<Street> getStreets() { return _streets; } @@ -74,13 +78,13 @@ public class ConfiguratorTest extends TestCase { } public static class Street { - private Class _clazz; + private Class<?> _clazz; - private List _trees = new ArrayList(); + private final List<Tree> _trees = new ArrayList<Tree>(); - private List _walkers = new ArrayList(); + private final List<Person> _walkers = new ArrayList<Person>(); - public List getTrees() { + public List<Tree> getTrees() { return _trees; } @@ -88,31 +92,31 @@ public class ConfiguratorTest extends TestCase { _trees.add(tree); } - public List getWalkers() { + public List<Person> getWalkers() { return _walkers; } - public void addConfiguredWalker(Map walkerAttributes) { - _walkers.add(new Person((String) walkerAttributes.get("name"))); + public void addConfiguredWalker(Map<String, String> walkerAttributes) { + _walkers.add(new Person(walkerAttributes.get("name"))); } - public Class getClazz() { + public Class<?> getClazz() { return _clazz; } - public void setClazz(Class clazz) { + public void setClazz(Class<?> clazz) { _clazz = clazz; } } public static abstract class Housing { - private List _rooms = new ArrayList(); + private final List<Room> _rooms = new ArrayList<Room>(); private boolean _isEmpty; private Person _proprietary; - public List getRooms() { + public List<Room> getRooms() { return _rooms; } @@ -177,7 +181,7 @@ public class ConfiguratorTest extends TestCase { } public static class Person { - private String _name; + private final String _name; public Person(String name) { _name = name; @@ -190,16 +194,19 @@ public class ConfiguratorTest extends TestCase { private Configurator _conf; - protected void setUp() throws Exception { + @Before + public void setUp() { _conf = new Configurator(); } + @Test public void testSetRoot() { City city = new City(); _conf.setRoot(city); assertEquals(city, _conf.getCurrent()); } + @Test public void testStringAttribute() { City city = new City(); _conf.setRoot(city); @@ -207,6 +214,7 @@ public class ConfiguratorTest extends TestCase { assertEquals("bordeaux", city.getName()); } + @Test public void testIntAttribute() { Flat flat = new Flat(); _conf.setRoot(flat); @@ -214,6 +222,7 @@ public class ConfiguratorTest extends TestCase { assertEquals(4, flat.getStage()); } + @Test public void testBooleanAttribute() { Housing housing = new House(); _conf.setRoot(housing); @@ -231,6 +240,7 @@ public class ConfiguratorTest extends TestCase { assertEquals(false, housing.isEmpty()); } + @Test public void testClassAttribute() { Street street = new Street(); _conf.setRoot(street); @@ -238,6 +248,7 @@ public class ConfiguratorTest extends TestCase { assertEquals(getClass(), street.getClazz()); } + @Test public void testPersonAttribute() { Housing housing = new House(); _conf.setRoot(housing); @@ -245,17 +256,19 @@ public class ConfiguratorTest extends TestCase { assertEquals("jean", housing.getProprietary().getName()); } + @Test public void testAddRoom() { Housing housing = new House(); _conf.setRoot(housing); _conf.startCreateChild("room"); assertEquals(1, housing.getRooms().size()); _conf.setAttribute("surface", "24"); - assertEquals(24, ((Room) housing.getRooms().get(0)).getSurface()); + assertEquals(24, housing.getRooms().get(0).getSurface()); _conf.endCreateChild(); assertEquals(housing, _conf.getCurrent()); } + @Test public void testAddConfiguredTree() { Street street = new Street(); _conf.setRoot(street); @@ -264,10 +277,11 @@ public class ConfiguratorTest extends TestCase { _conf.setAttribute("age", "400"); _conf.endCreateChild(); assertEquals(1, street.getTrees().size()); - assertEquals(400, ((Tree) street.getTrees().get(0)).getAge()); + assertEquals(400, street.getTrees().get(0).getAge()); assertEquals(street, _conf.getCurrent()); } + @Test public void testAddConfiguredWalker() { Street street = new Street(); _conf.setRoot(street); @@ -276,10 +290,11 @@ public class ConfiguratorTest extends TestCase { _conf.setAttribute("name", "xavier"); _conf.endCreateChild(); assertEquals(1, street.getWalkers().size()); - assertEquals("xavier", ((Person) street.getWalkers().get(0)).getName()); + assertEquals("xavier", street.getWalkers().get(0).getName()); assertEquals(street, _conf.getCurrent()); } + @Test public void testAddWithTypeDef() throws Exception { City city = new City(); _conf.typeDef("house", House.class.getName()); @@ -300,6 +315,7 @@ public class ConfiguratorTest extends TestCase { assertEquals(city, _conf.getCurrent()); } + @Test public void testNested() throws Exception { City city = new City(); _conf.typeDef("house", House.class.getName()); @@ -313,13 +329,12 @@ public class ConfiguratorTest extends TestCase { _conf.endCreateChild(); _conf.endCreateChild(); assertEquals(city, _conf.getCurrent()); - assertEquals(2, ((Housing) city.getHousings().get(0)).getRooms().size()); - assertEquals(20, - ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0)).getSurface()); - assertEquals(25, - ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1)).getSurface()); + assertEquals(2, 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()); } + @Test public void testMacro() throws Exception { City city = new City(); _conf.typeDef("house", House.class.getName()); @@ -356,22 +371,18 @@ public class ConfiguratorTest extends TestCase { assertEquals(2, city.getHousings().size()); // first castle : 2 default rooms of 10 of surface - assertEquals(2, ((Housing) city.getHousings().get(0)).getRooms().size()); - assertEquals(10, - ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0)).getSurface()); - assertEquals(10, - ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1)).getSurface()); + assertEquals(2, city.getHousings().get(0).getRooms().size()); + assertEquals(10, city.getHousings().get(0).getRooms().get(0).getSurface()); + assertEquals(10, city.getHousings().get(0).getRooms().get(1).getSurface()); // second castle : 2 default rooms of default surface 40, + one addroom of surface 20 - assertEquals(3, ((Housing) city.getHousings().get(1)).getRooms().size()); - assertEquals(40, - ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(0)).getSurface()); - assertEquals(40, - ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(1)).getSurface()); - assertEquals(20, - ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(2)).getSurface()); + assertEquals(3, city.getHousings().get(1).getRooms().size()); + assertEquals(40, city.getHousings().get(1).getRooms().get(0).getSurface()); + assertEquals(40, city.getHousings().get(1).getRooms().get(1).getSurface()); + assertEquals(20, city.getHousings().get(1).getRooms().get(2).getSurface()); } + @Test public void testFileAttribute() { FileTester root = new FileTester(); _conf.setRoot(root); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/IvyPatternHelperTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/IvyPatternHelperTest.java b/test/java/org/apache/ivy/util/IvyPatternHelperTest.java index 694408e..50337bb 100644 --- a/test/java/org/apache/ivy/util/IvyPatternHelperTest.java +++ b/test/java/org/apache/ivy/util/IvyPatternHelperTest.java @@ -21,16 +21,20 @@ import java.util.HashMap; import java.util.Map; import org.apache.ivy.core.IvyPatternHelper; +import org.junit.Test; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; -public class IvyPatternHelperTest extends TestCase { +public class IvyPatternHelperTest { + @Test public void testSubstitute() { String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]"; assertEquals("apache/Test/build/archives/jars/test-1.0.jar", IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar")); } + @Test public void testCyclicSubstitute() { String pattern = "${var}"; Map variables = new HashMap(); @@ -46,6 +50,7 @@ public class IvyPatternHelperTest extends TestCase { } } + @Test public void testOptionalSubstitute() { Map tokens = new HashMap(); tokens.put("token", ""); @@ -57,23 +62,27 @@ public class IvyPatternHelperTest extends TestCase { IvyPatternHelper.substituteTokens("test(-[token])(-[othertoken])", tokens)); } + @Test public void testOrganization() { String pattern = "[organization]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]"; assertEquals("apache/Test/build/archives/jars/test-1.0.jar", IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar")); } + @Test public void testSpecialCharsInsidePattern() { String pattern = "[organization]/[module]/build/archives (x86)/[type]s/[artifact]-[revision].[ext]"; assertEquals("apache/Test/build/archives (x86)/jars/test-1.0.jar", IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar")); } + @Test public void testTokenRoot() { String pattern = "lib/[type]/[artifact].[ext]"; assertEquals("lib/", IvyPatternHelper.getTokenRoot(pattern)); } + @Test public void testTokenRootWithOptionalFirstToken() { String pattern = "lib/([type]/)[artifact].[ext]"; assertEquals("lib/", IvyPatternHelper.getTokenRoot(pattern)); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/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 c38d0ef..3315c68 100644 --- a/test/java/org/apache/ivy/util/MockMessageLogger.java +++ b/test/java/org/apache/ivy/util/MockMessageLogger.java @@ -18,18 +18,15 @@ package org.apache.ivy.util; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import junit.framework.AssertionFailedError; - public class MockMessageLogger extends AbstractMessageLogger { - private List _endProgress = new ArrayList(); + private final List<String> _endProgress = new ArrayList<String>(); - private List _logs = new ArrayList(); + private final List<String> _logs = new ArrayList<String>(); - private List _rawLogs = new ArrayList(); + private final List<String> _rawLogs = new ArrayList<String>(); private int _progressCalls; @@ -49,11 +46,11 @@ public class MockMessageLogger extends AbstractMessageLogger { _rawLogs.add(level + " " + msg); } - public List getEndProgress() { + public List<String> getEndProgress() { return _endProgress; } - public List getLogs() { + public List<String> getLogs() { return _logs; } @@ -61,7 +58,7 @@ public class MockMessageLogger extends AbstractMessageLogger { return _progressCalls; } - public List getRawLogs() { + public List<String> getRawLogs() { return _rawLogs; } @@ -73,21 +70,19 @@ public class MockMessageLogger extends AbstractMessageLogger { } public void assertLogContains(String message) { - for (Iterator iter = _logs.iterator(); iter.hasNext();) { - String log = (String) iter.next(); - if (log.indexOf(message) != -1) { + for (String log : _logs) { + if (log.contains(message)) { return; } } - throw new AssertionFailedError("logs do not contain expected message: expected='" + message + throw new AssertionError("logs do not contain expected message: expected='" + message + "' logs='\n" + join(_logs) + "'"); } public void assertLogDoesntContain(String message) { - for (Iterator iter = _logs.iterator(); iter.hasNext();) { - String log = (String) iter.next(); - if (log.indexOf(message) != -1) { - throw new AssertionFailedError("logs contain unexpected message: '" + message + for (String log : _logs) { + if (log.contains(message)) { + throw new AssertionError("logs contain unexpected message: '" + message + "' logs='\n" + join(_logs) + "'"); } } @@ -111,10 +106,9 @@ public class MockMessageLogger extends AbstractMessageLogger { assertLogContains(Message.MSG_ERR + " " + message); } - private String join(List logs) { - StringBuffer sb = new StringBuffer(); - for (Iterator iter = logs.iterator(); iter.hasNext();) { - String log = (String) iter.next(); + private String join(List<String> logs) { + StringBuilder sb = new StringBuilder(); + for (String log : logs) { sb.append(log).append("\n"); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/StringUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/StringUtilsTest.java b/test/java/org/apache/ivy/util/StringUtilsTest.java index 2763c18..3d48fb2 100644 --- a/test/java/org/apache/ivy/util/StringUtilsTest.java +++ b/test/java/org/apache/ivy/util/StringUtilsTest.java @@ -17,17 +17,22 @@ */ package org.apache.ivy.util; -import junit.framework.TestCase; +import org.junit.Test; -public class StringUtilsTest extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +public class StringUtilsTest { + + @Test public void testGetStackTrace() throws Exception { String trace = StringUtils.getStackTrace(new Exception()); - assertTrue(trace.indexOf("java.lang.Exception") != -1); - assertTrue(trace - .indexOf("at org.apache.ivy.util.StringUtilsTest.testGetStackTrace(StringUtilsTest.java") != -1); + assertTrue(trace.contains("java.lang.Exception")); + assertTrue(trace.contains("at org.apache.ivy.util.StringUtilsTest.testGetStackTrace(StringUtilsTest.java")); } + @Test public void testEncryption() { assertEquals("apache", StringUtils.decrypt(StringUtils.encrypt("apache"))); assertEquals("yet another string with 126 digits and others :;%_-$& characters", http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java index 0f1ff1a..a13467d 100644 --- a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java @@ -24,13 +24,16 @@ import java.net.URL; import org.apache.ivy.util.CopyProgressListener; -import junit.framework.TestCase; +import org.junit.Test; -public class AbstractURLHandlerTest extends TestCase { +import static org.junit.Assert.assertEquals; + +public class AbstractURLHandlerTest { /** * JUnit test for IVY-923. */ + @Test public void testNormalizeToStringWithSpaceURL() throws Exception { AbstractURLHandler handler = new TestURLHandler(); String normalizedUrl = handler.normalizeToString(new URL( @@ -41,6 +44,7 @@ public class AbstractURLHandlerTest extends TestCase { /** * JUnit test for IVY-923. */ + @Test public void testNormalizeToStringWithPlusCharacter() throws Exception { AbstractURLHandler handler = new TestURLHandler(); String normalizedUrl = handler.normalizeToString(new URL( @@ -48,6 +52,7 @@ public class AbstractURLHandlerTest extends TestCase { assertEquals("http://ant.apache.org/ivy/ivy-1.%2B.xml";, normalizedUrl); } + @Test public void testNormalizeToStringWithUnderscoreInHostname() throws Exception { AbstractURLHandler handler = new TestURLHandler(); String normalizedUrl = handler.normalizeToString(new URL( @@ -55,6 +60,7 @@ public class AbstractURLHandlerTest extends TestCase { assertEquals("http://peat_hal.users.sourceforge.net/m2repository";, normalizedUrl); } + @Test public void testNormalizeToStringWithUnderscoreInHostnameAndSpaceInPath() throws Exception { AbstractURLHandler handler = new TestURLHandler(); String normalizedUrl = handler.normalizeToString(new URL( http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java index 509b40d..dfca614 100644 --- a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java +++ b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java @@ -21,18 +21,23 @@ import java.net.URL; import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Tests {@link ApacheURLLister}. */ -public class ApacheURLListerTest extends TestCase { +public class ApacheURLListerTest { /** * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}. * * @throws Exception */ + @Test public void testRetrieveListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); @@ -62,6 +67,7 @@ public class ApacheURLListerTest extends TestCase { * * @throws Exception */ + @Test public void testRetrieveListingWithSpaces() throws Exception { ApacheURLLister lister = new ApacheURLLister(); @@ -71,6 +77,7 @@ public class ApacheURLListerTest extends TestCase { assertTrue(files.size() > 0); } + @Test public void testRetrieveArtifactoryListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); @@ -80,6 +87,7 @@ public class ApacheURLListerTest extends TestCase { assertEquals(1, files.size()); } + @Test public void testRetrieveArchivaListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); @@ -91,6 +99,7 @@ public class ApacheURLListerTest extends TestCase { // assertEquals(3, d.size()); } + @Test public void testRetrieveFixedArchivaListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); @@ -100,6 +109,7 @@ public class ApacheURLListerTest extends TestCase { assertEquals(3, d.size()); } + @Test public void testRetrieveMavenProxyListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java b/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java index 8d6b25f..5cee76c 100644 --- a/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java +++ b/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java @@ -17,14 +17,18 @@ */ package org.apache.ivy.util.url; +import org.junit.Test; + import java.net.URL; import java.util.List; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; -public class ArtifactoryListingTest extends TestCase { +public class ArtifactoryListingTest { // remote.test + @Test public void testWicketListing() throws Exception { ApacheURLLister lister = new ApacheURLLister(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java index c6da184..65269fa 100644 --- a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java @@ -22,28 +22,36 @@ import java.net.URL; import org.apache.ivy.util.FileUtil; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Test BasicURLHandler */ -public class BasicURLHandlerTest extends TestCase { +public class BasicURLHandlerTest { // remote.test private File testDir; private BasicURLHandler handler; - protected void setUp() throws Exception { + @Before + public void setUp() { testDir = new File("build/BasicURLHandlerTest"); testDir.mkdirs(); handler = new BasicURLHandler(); } - protected void tearDown() throws Exception { + @After + public void tearDown() { FileUtil.forceDelete(testDir); } + @Test public void testIsReachable() throws Exception { final int connectionTimeoutInMillis = 15000; // 15 seconds assertTrue(handler.isReachable(new URL("http://www.google.fr/";), connectionTimeoutInMillis)); @@ -57,6 +65,7 @@ public class BasicURLHandlerTest extends TestCase { assertFalse(handler.isReachable(new URL("ftp://ftp.mozilla.org/unknown.file";), connectionTimeoutInMillis)); } + @Test public void testContentEncoding() throws Exception { assertDownloadOK(new URL("http://carsten.codimi.de/gzip.yaws/daniels.html";), new File( testDir, "gzip.txt")); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1543f528/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java index e88263e..80cdd1a 100644 --- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java @@ -23,33 +23,43 @@ import java.net.URL; import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.url.URLHandler.URLInfo; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Test HttpClientHandler */ -public class HttpclientURLHandlerTest extends TestCase { +public class HttpclientURLHandlerTest { // remote.test private File testDir; private HttpClientHandler handler; - protected void setUp() throws Exception { + @Before + public void setUp() { testDir = new File("build/HttpclientURLHandlerTest"); testDir.mkdirs(); handler = new HttpClientHandler(); } - protected void tearDown() throws Exception { + @After + public void tearDown() { FileUtil.forceDelete(testDir); } + @Test public void testIsReachable() throws Exception { assertTrue(handler.isReachable(new URL("http://www.google.fr/";))); assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html";))); } + @Test public void testGetURLInfo() throws Exception { // IVY-390 URLHandler handler = new HttpClientHandler(); @@ -60,6 +70,7 @@ public class HttpclientURLHandlerTest extends TestCase { assertEquals(URLHandler.UNAVAILABLE, info); } + @Test public void testContentEncoding() throws Exception { assertDownloadOK(new URL("http://carsten.codimi.de/gzip.yaws/daniels.html";), new File( testDir, "gzip.txt"));
