Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java Fri Nov 19 14:11:22 2010 @@ -17,38 +17,30 @@ */ package org.apache.ivy.osgi.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.HashSet; import java.util.Set; -import org.apache.ivy.osgi.core.BundleInfo; -import org.apache.ivy.osgi.core.BundleRequirement; -import org.apache.ivy.osgi.core.ManifestParser; -import org.apache.ivy.osgi.util.VersionRange; -import org.junit.Test; +import junit.framework.TestCase; +import org.apache.ivy.osgi.util.VersionRange; -public class ManifestParserTest { +public class ManifestParserTest extends TestCase { - @Test public void testParseManifest() throws Exception { BundleInfo bundleInfo; - bundleInfo = ManifestParser.parseJarManifest(getClass().getClassLoader().getResourceAsStream( - "com.acme.alpha-1.0.0.20080101.jar")); + bundleInfo = ManifestParser.parseJarManifest(getClass().getClassLoader() + .getResourceAsStream("com.acme.alpha-1.0.0.20080101.jar")); assertEquals("com.acme.alpha", bundleInfo.getSymbolicName()); assertEquals("1.0.0", bundleInfo.getVersion().numbersAsString()); assertEquals("20080101", bundleInfo.getVersion().qualifier()); assertEquals("1.0.0.20080101", bundleInfo.getVersion().toString()); assertEquals(2, bundleInfo.getRequires().size()); - Set<BundleRequirement> expectedRequires = new HashSet<BundleRequirement>(); - expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.bravo", new VersionRange("2.0.0"), - null)); - expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.delta", new VersionRange("4.0.0"), - null)); + Set/* <BundleRequirement> */expectedRequires = new HashSet/* <BundleRequirement> */(); + expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.bravo", + new VersionRange("2.0.0"), null)); + expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.delta", + new VersionRange("4.0.0"), null)); assertEquals(expectedRequires, bundleInfo.getRequires()); assertEquals(0, bundleInfo.getExports().size()); assertEquals(2, bundleInfo.getImports().size()); @@ -57,15 +49,15 @@ public class ManifestParserTest { assertTrue(importsList.contains("com.acme.bravo")); assertTrue(importsList.contains("com.acme.delta")); - bundleInfo = ManifestParser.parseJarManifest(getClass().getClassLoader().getResourceAsStream( - "com.acme.bravo-2.0.0.20080202.jar")); + bundleInfo = ManifestParser.parseJarManifest(getClass().getClassLoader() + .getResourceAsStream("com.acme.bravo-2.0.0.20080202.jar")); assertNotNull(bundleInfo); assertEquals("com.acme.bravo", bundleInfo.getSymbolicName()); assertEquals("2.0.0", bundleInfo.getVersion().numbersAsString()); assertEquals("20080202", bundleInfo.getVersion().qualifier()); assertEquals("2.0.0.20080202", bundleInfo.getVersion().toString()); assertEquals(1, bundleInfo.getRequires().size()); - expectedRequires = new HashSet<BundleRequirement>(); + expectedRequires = new HashSet/* <BundleRequirement> */(); expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.charlie", new VersionRange("3.0.0"), null)); assertEquals(1, bundleInfo.getExports().size());
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java Fri Nov 19 14:11:22 2010 @@ -23,6 +23,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import org.apache.ivy.Ivy; @@ -39,24 +40,29 @@ public class IvyIntegrationTest extends return new File("java/test-ivy/" + resource).toURI().toURL(); } - @SuppressWarnings("unchecked") public void testAcmeResolveAlpha() throws Exception { final Ivy ivy = Ivy.newInstance(); ivy.configure(getTestResource("acme-ivysettings.xml")); - final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("com.acme", "alpha"), "1.0+"); - // final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("com.acme", "delta"), "4+"); - // final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("com.acme", "echo"), "5+"); + final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("com.acme", "alpha"), + "1.0+"); + // final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("com.acme", "delta"), + // "4+"); + // final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("com.acme", "echo"), + // "5+"); final ResolveOptions options = new ResolveOptions(); - options.setConfs(new String[] { "default" }); + options.setConfs(new String[] {"default"}); final ResolveReport report = ivy.resolve(mrid, options, false); assertEquals(5, report.getDependencies().size()); - final String[] names = new String[] { "com.acme#alpha;1.0.0.20080101", "com.acme#bravo;2.0.0.20080202", - "com.acme#charlie;3.0.0.20080303", "com.acme#delta;4.0.0", "com.acme#echo;5.0.0" }; - final Set<String> nodeNames = new HashSet<String>(Arrays.asList(names)); - for (IvyNode node : (Collection<IvyNode>) report.getDependencies()) { + final String[] names = new String[] {"com.acme#alpha;1.0.0.20080101", + "com.acme#bravo;2.0.0.20080202", "com.acme#charlie;3.0.0.20080303", + "com.acme#delta;4.0.0", "com.acme#echo;5.0.0"}; + final Set/* <String> */nodeNames = new HashSet/* <String> */(Arrays.asList(names)); + Iterator itNode = ((Collection/* <IvyNode> */) report.getDependencies()).iterator(); + while (itNode.hasNext()) { + IvyNode node = (IvyNode) itNode.next(); assertTrue(" Contains: " + node, nodeNames.contains(node.toString())); } } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java Fri Nov 19 14:11:22 2010 @@ -17,20 +17,17 @@ */ package org.apache.ivy.osgi.ivy; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; -import org.apache.ivy.osgi.ivy.internal.JarEntryResource; -import org.junit.Test; +import junit.framework.TestCase; +import org.apache.ivy.osgi.ivy.internal.JarEntryResource; -public class JarHandlingRepositoryTest { +public class JarHandlingRepositoryTest extends TestCase { - @Test public void test() throws IOException { - final JarEntryResource resource = new JarEntryResource("java/test-bundles/jars/com.acme.alpha-1.0.0.20080101.jar!META-INF/MANIFEST.MF"); + final JarEntryResource resource = new JarEntryResource( + "java/test-bundles/jars/com.acme.alpha-1.0.0.20080101.jar!META-INF/MANIFEST.MF"); assertNotNull(resource.openStream()); assertTrue(resource.isLocal()); assertTrue(resource.exists()); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java Fri Nov 19 14:11:22 2010 @@ -17,68 +17,70 @@ */ package org.apache.ivy.osgi.ivy; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import junit.framework.TestCase; + import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.settings.IvySettings; -import org.apache.ivy.osgi.ivy.OsgiIvyParser; import org.apache.ivy.plugins.parser.ModuleDescriptorParser; import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry; import org.apache.ivy.plugins.repository.url.URLResource; -import org.junit.Test; -public class OsgiIvyParserTest { +public class OsgiIvyParserTest extends TestCase { - @Test public void testSimple() throws Exception { IvySettings settings = new IvySettings(); settings.load(new File("java/test-ivy/include/ivysettings.xml")); - URLResource includingResource = new URLResource(new File("java/test-ivy/include/ivy.xml").toURL()); - ModuleDescriptorParser includingParser = ModuleDescriptorParserRegistry.getInstance().getParser( - includingResource); + URLResource includingResource = new URLResource( + new File("java/test-ivy/include/ivy.xml").toURL()); + ModuleDescriptorParser includingParser = ModuleDescriptorParserRegistry.getInstance() + .getParser(includingResource); assertTrue(includingParser instanceof OsgiIvyParser); - ModuleDescriptor includingMd = includingParser.parseDescriptor(settings, includingResource.getURL(), false); + ModuleDescriptor includingMd = includingParser.parseDescriptor(settings, + includingResource.getURL(), false); assertNotNull(includingMd); - URLResource resultResource = new URLResource(new File("java/test-ivy/include/ivy-result.xml").toURL()); - ModuleDescriptorParser resultParser = ModuleDescriptorParserRegistry.getInstance().getParser(resultResource); - ModuleDescriptor resultMd = resultParser.parseDescriptor(settings, resultResource.getURL(), false); + URLResource resultResource = new URLResource(new File( + "java/test-ivy/include/ivy-result.xml").toURL()); + ModuleDescriptorParser resultParser = ModuleDescriptorParserRegistry.getInstance() + .getParser(resultResource); + ModuleDescriptor resultMd = resultParser.parseDescriptor(settings, resultResource.getURL(), + false); assertEquals(resultMd.getModuleRevisionId(), includingMd.getModuleRevisionId()); - assertEquals(resultMd.getResolvedModuleRevisionId(), includingMd.getResolvedModuleRevisionId()); + assertEquals(resultMd.getResolvedModuleRevisionId(), + includingMd.getResolvedModuleRevisionId()); assertEquals(resultMd.getDescription(), includingMd.getDescription()); assertEquals(resultMd.getHomePage(), includingMd.getHomePage()); // assertEquals(resultMd.getLastModified(), includingMd.getLastModified()); assertEquals(resultMd.getStatus(), includingMd.getStatus()); assertEquals(resultMd.getExtraInfo(), includingMd.getExtraInfo()); - assertArrayEquals(resultMd.getLicenses(), includingMd.getLicenses()); - assertSetEquals(resultMd.getConfigurations(), includingMd.getConfigurations()); - assertArrayEquals(resultMd.getAllArtifacts(), includingMd.getAllArtifacts()); + assertArrayEquals((Object[]) resultMd.getLicenses(), (Object[]) includingMd.getLicenses()); + assertArrayEquals(resultMd.getConfigurations(), includingMd.getConfigurations()); + assertArrayEquals((Object[]) resultMd.getAllArtifacts(), + (Object[]) includingMd.getAllArtifacts()); assertEquals(resultMd.getDependencies().length, includingMd.getDependencies().length); for (int i = 0; i < resultMd.getDependencies().length; i++) { - assertEquals(resultMd.getDependencies()[i].getDependencyRevisionId(), includingMd.getDependencies()[i] - .getDependencyRevisionId()); - assertArrayEquals(resultMd.getDependencies()[i].getModuleConfigurations(), includingMd.getDependencies()[i] - .getModuleConfigurations()); + assertEquals(resultMd.getDependencies()[i].getDependencyRevisionId(), + includingMd.getDependencies()[i].getDependencyRevisionId()); + assertArrayEquals((Object[]) resultMd.getDependencies()[i].getModuleConfigurations(), + (Object[]) includingMd.getDependencies()[i].getModuleConfigurations()); } } - private static <T1,T2> void assertSetEquals(T1[] expected, T2[] actual) { - assertSetEquals(Arrays.asList(expected), Arrays.asList(actual)); + private static/* <T1,T2> */void assertArrayEquals(Object/* T1 */[] expected, + Object/* T2 */[] actual) { + assertSetEquals(Arrays.asList(expected), Arrays.asList(actual)); } - private static <T1,T2> void assertSetEquals(List<T1> expected, List<T2> actual) { - assertEquals(new HashSet<T1>(expected), new HashSet<T2>(actual)); + private static/* <T1,T2> */void assertSetEquals(List/* <T1> */expected, List/* <T2> */actual) { + assertEquals(new HashSet/* <T1> */(expected), new HashSet/* <T2> */(actual)); } } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java Fri Nov 19 14:11:22 2010 @@ -17,8 +17,6 @@ */ package org.apache.ivy.osgi.ivy; -import static java.lang.ClassLoader.getSystemResource; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -36,15 +34,11 @@ import org.apache.ivy.core.module.descri import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.settings.IvySettings; -import org.apache.ivy.osgi.ivy.OsgiManifestParser; import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParserTester; import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest; import org.apache.ivy.plugins.repository.url.URLResource; import org.apache.ivy.util.FileUtil; -/** - * @author [email protected] - */ public class OsgiManifestParserTest extends AbstractModuleDescriptorParserTester { private URL getTestResource(String resource) throws MalformedURLException { @@ -53,50 +47,55 @@ public class OsgiManifestParserTest exte public void testAccept() throws Exception { assertTrue(OsgiManifestParser.getInstance().accept( - new URLResource(getTestResource("osgi/eclipse/plugins/test-simple/META-INF/MANIFEST.MF")))); + new URLResource( + getTestResource("osgi/eclipse/plugins/test-simple/META-INF/MANIFEST.MF")))); assertFalse(OsgiManifestParser.getInstance().accept( - new URLResource(XmlModuleDescriptorParserTest.class.getResource("test.xml")))); + new URLResource(XmlModuleDescriptorParserTest.class.getResource("test.xml")))); } public void testSimple() throws Exception { - final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor(new IvySettings(), - getTestResource("osgi/eclipse/plugins/test-simple/META-INF/MANIFEST.MF"), false); + final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor( + new IvySettings(), + getTestResource("osgi/eclipse/plugins/test-simple/META-INF/MANIFEST.MF"), false); assertNotNull(md); assertSimpleModuleDescriptor(md); } public void testSimpleFromJar() throws Exception { - final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor(new IvySettings(), - getTestResource("test-simple.jar"), false); + final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor( + new IvySettings(), getTestResource("test-simple.jar"), false); assertNotNull(md); assertSimpleModuleDescriptor(md); } public void testFull() throws Exception { - final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor(new IvySettings(), - getTestResource("osgi/eclipse/plugins/test-full/META-INF/MANIFEST.MF"), false); + final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor( + new IvySettings(), + getTestResource("osgi/eclipse/plugins/test-full/META-INF/MANIFEST.MF"), false); assertNotNull(md); assertSimpleModuleDescriptor(md); assertDependencies(md); } public void testFullFromJar() throws Exception { - final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor(new IvySettings(), - getTestResource("test-full.jar"), false); + final ModuleDescriptor md = OsgiManifestParser.getInstance().parseDescriptor( + new IvySettings(), getTestResource("test-full.jar"), false); assertNotNull(md); assertSimpleModuleDescriptor(md); assertDependencies(md); } public void testJB() throws Exception { - final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("org", "name"), "revisionId"); - final Artifact artifact = new DefaultArtifact(mrid, new Date(), "META-INF/MANIFEST", "manifest", "MF", true); + final ModuleRevisionId mrid = new ModuleRevisionId(new ModuleId("org", "name"), + "revisionId"); + final Artifact artifact = new DefaultArtifact(mrid, new Date(), "META-INF/MANIFEST", + "manifest", "MF", true); System.out.println(artifact); } private void assertSimpleModuleDescriptor(ModuleDescriptor md) throws Exception { - final ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.eclipse", "datatools.connectivity.ui", - "1.0.1.200708231"); + final ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.eclipse", + "datatools.connectivity.ui", "1.0.1.200708231"); assertEquals(mrid, md.getModuleRevisionId()); assertNotNull(md.getConfigurations()); @@ -117,20 +116,25 @@ public class OsgiManifestParserTest exte private void assertDependencies(ModuleDescriptor md) throws Exception { final DependencyDescriptor[] dds = md.getDependencies(); assertNotNull(dds); - Set<ModuleRevisionId> actual = new HashSet<ModuleRevisionId>(); - for (DependencyDescriptor dd : md.getDependencies()) { + Set/* <ModuleRevisionId> */actual = new HashSet/* <ModuleRevisionId> */(); + DependencyDescriptor[] deps = md.getDependencies(); + for (int i = 0; i < deps.length; i++) { + DependencyDescriptor dd = deps[i]; actual.add(dd.getDependencyRevisionId()); } - Set<ModuleRevisionId> expected = new HashSet<ModuleRevisionId>(); + Set/* <ModuleRevisionId> */expected = new HashSet/* <ModuleRevisionId> */(); expected.add(ModuleRevisionId.newInstance("org.eclipse", "core.runtime", "[3.2.0,4.0.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "core.resources", "[3.2.0,4.0.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "ui", "[3.2.0,4.0.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "ui.views", "[3.2.0,4.0.0)")); - expected.add(ModuleRevisionId.newInstance("org.eclipse", "datatools.connectivity", "[0.9.1,1.5.0)")); + expected.add(ModuleRevisionId.newInstance("org.eclipse", "datatools.connectivity", + "[0.9.1,1.5.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "ui.navigator", "[3.2.0,4.0.0)")); - expected.add(ModuleRevisionId.newInstance("org.eclipse", "core.expressions", "[3.2.0,4.0.0)")); + expected.add(ModuleRevisionId.newInstance("org.eclipse", "core.expressions", + "[3.2.0,4.0.0)")); expected.add(ModuleRevisionId.newInstance("com.ibm", "icu", "[3.4.0,4.0.0)")); - expected.add(ModuleRevisionId.newInstance("org.eclipse", "ltk.core.refactoring", "[3.2.0,4.0.0)")); + expected.add(ModuleRevisionId.newInstance("org.eclipse", "ltk.core.refactoring", + "[3.2.0,4.0.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "datatools.help", "[1.0.0,2.0.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "help", "[3.2.0,4.0.0)")); expected.add(ModuleRevisionId.newInstance("org.eclipse", "help.base", "[3.2.0,4.0.0)")); @@ -139,8 +143,8 @@ public class OsgiManifestParserTest exte } private String readEntirely(String resource) throws IOException { - return FileUtil - .readEntirely(new BufferedReader(new InputStreamReader(getSystemResource(resource).openStream()))); + return FileUtil.readEntirely(new BufferedReader(new InputStreamReader(ClassLoader + .getSystemResource(resource).openStream()))); } } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java Fri Nov 19 14:11:22 2010 @@ -17,30 +17,30 @@ */ package org.apache.ivy.osgi.obr; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.io.File; import java.io.FileInputStream; +import java.util.Iterator; + +import junit.framework.TestCase; import org.apache.ivy.osgi.obr.xml.OBRXMLParser; import org.apache.ivy.osgi.repo.BundleRepo; import org.apache.ivy.util.Message; -import org.junit.Test; +public class OBRParserTest extends TestCase { -public class OBRParserTest { - - @Test public void testParse() throws Exception { - BundleRepo repo = OBRXMLParser.parse(new FileInputStream(new File("java/test-obr/obr.xml"))); + BundleRepo repo = OBRXMLParser + .parse(new FileInputStream(new File("java/test-obr/obr.xml"))); assertNotNull(repo); - System.out.println(repo.getBundles().size() + " bundles successfully parsed, " + Message.getProblems().size() + " errors"); - for (Object error : Message.getProblems()) { + System.out.println(repo.getBundles().size() + " bundles successfully parsed, " + + Message.getProblems().size() + " errors"); + Iterator itPb = Message.getProblems().iterator(); + while (itPb.hasNext()) { + Object error = itPb.next(); System.err.println(error); } assertEquals("OBR/Releases", repo.getName()); assertEquals(new Long(1253581430652l), repo.getLastModified()); } - } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java Fri Nov 19 14:11:22 2010 @@ -20,18 +20,16 @@ package org.apache.ivy.osgi.obr; import java.text.ParseException; import junit.framework.Assert; +import junit.framework.TestCase; import org.apache.ivy.osgi.obr.filter.AndFilter; import org.apache.ivy.osgi.obr.filter.CompareFilter; -import org.apache.ivy.osgi.obr.filter.RequirementFilterParser; import org.apache.ivy.osgi.obr.filter.CompareFilter.Operator; +import org.apache.ivy.osgi.obr.filter.RequirementFilterParser; import org.apache.ivy.osgi.obr.xml.RequirementFilter; -import org.junit.Test; - -public class RequirementFilterTest { +public class RequirementFilterTest extends TestCase { - @Test public void testParser() throws Exception { assertParseFail("c>2"); assertParseFail(""); @@ -40,11 +38,13 @@ public class RequirementFilterTest { checkParse(cgt2, "(c>2)"); RequirementFilter twoeqd = new CompareFilter("2", Operator.EQUALS, "d"); checkParse(twoeqd, "(2=d)"); - RequirementFilter foodorbarge0dot0 = new CompareFilter("foo.bar", Operator.GREATER_OR_EQUAL, "0.0"); + RequirementFilter foodorbarge0dot0 = new CompareFilter("foo.bar", + Operator.GREATER_OR_EQUAL, "0.0"); checkParse(foodorbarge0dot0, "(foo.bar>=0.0)"); - RequirementFilter and = new AndFilter(foodorbarge0dot0); + RequirementFilter and = new AndFilter(new RequirementFilter[] {foodorbarge0dot0}); checkParse(and, "(&(foo.bar>=0.0))"); - RequirementFilter and2 = new AndFilter(cgt2, twoeqd, foodorbarge0dot0); + RequirementFilter and2 = new AndFilter(new RequirementFilter[] {cgt2, twoeqd, + foodorbarge0dot0}); checkParse(and2, "(&(c>2)(2=d)(foo.bar>=0.0))"); } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java Fri Nov 19 14:11:22 2010 @@ -17,20 +17,18 @@ */ package org.apache.ivy.osgi.repo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.FileInputStream; import java.text.ParseException; import java.util.Arrays; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.jar.JarInputStream; +import junit.framework.TestCase; + import org.apache.ivy.Ivy; import org.apache.ivy.core.cache.RepositoryCacheManager; import org.apache.ivy.core.module.descriptor.Artifact; @@ -48,57 +46,62 @@ import org.apache.ivy.core.resolve.Resol import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.osgi.core.BundleInfo; import org.apache.ivy.osgi.core.ManifestParser; -import org.apache.ivy.osgi.repo.BundleInfoAdapter; -import org.apache.ivy.osgi.repo.BundleRepoResolver; import org.apache.ivy.osgi.repo.BundleRepoResolver.RequirementStrategy; import org.apache.ivy.plugins.resolver.DependencyResolver; import org.apache.ivy.plugins.resolver.DualResolver; import org.apache.ivy.plugins.resolver.FileSystemResolver; -import org.junit.Before; -import org.junit.Test; +public class BundleRepoResolverTest extends TestCase { -public class BundleRepoResolverTest { + private static final ModuleRevisionId MRID_TEST_BUNDLE = ModuleRevisionId.newInstance("", + "org.apache.ivy.osgitestbundle", "1.2.3", BundleInfoAdapter.OSGI_BUNDLE); - private static final ModuleRevisionId MRID_TEST_BUNDLE = ModuleRevisionId.newInstance("", "org.apache.ivy.osgitestbundle", - "1.2.3", BundleInfoAdapter.OSGI_BUNDLE); - - private static final ModuleRevisionId MRID_TEST_BUNDLE_IMPORTING = ModuleRevisionId.newInstance("", - "org.apache.ivy.osgi.testbundle.importing", "3.2.1", BundleInfoAdapter.OSGI_BUNDLE); + private static final ModuleRevisionId MRID_TEST_BUNDLE_IMPORTING = ModuleRevisionId + .newInstance("", "org.apache.ivy.osgi.testbundle.importing", "3.2.1", + BundleInfoAdapter.OSGI_BUNDLE); - private static final ModuleRevisionId MRID_TEST_BUNDLE_IMPORTING_VERSION = ModuleRevisionId.newInstance("", - "org.apache.ivy.osgi.testbundle.importing.version", "3.2.1", BundleInfoAdapter.OSGI_BUNDLE); + private static final ModuleRevisionId MRID_TEST_BUNDLE_IMPORTING_VERSION = ModuleRevisionId + .newInstance("", "org.apache.ivy.osgi.testbundle.importing.version", "3.2.1", + BundleInfoAdapter.OSGI_BUNDLE); - private static final ModuleRevisionId MRID_TEST_BUNDLE_IMPORTING_OPTIONAL = ModuleRevisionId.newInstance("", - "org.apache.ivy.osgi.testbundle.importing.optional", "3.2.1", BundleInfoAdapter.OSGI_BUNDLE); + private static final ModuleRevisionId MRID_TEST_BUNDLE_IMPORTING_OPTIONAL = ModuleRevisionId + .newInstance("", "org.apache.ivy.osgi.testbundle.importing.optional", "3.2.1", + BundleInfoAdapter.OSGI_BUNDLE); private static final ModuleRevisionId MRID_TEST_BUNDLE_USE = ModuleRevisionId.newInstance("", - "org.apache.ivy.osgi.testbundle.use", "2.2.2", BundleInfoAdapter.OSGI_BUNDLE); + "org.apache.ivy.osgi.testbundle.use", "2.2.2", BundleInfoAdapter.OSGI_BUNDLE); - private static final ModuleRevisionId MRID_TEST_BUNDLE_EXPORTING_AMBIGUITY = ModuleRevisionId.newInstance("", - "org.apache.ivy.osgi.testbundle.exporting.ambiguity", "3.3.3", BundleInfoAdapter.OSGI_BUNDLE); + private static final ModuleRevisionId MRID_TEST_BUNDLE_EXPORTING_AMBIGUITY = ModuleRevisionId + .newInstance("", "org.apache.ivy.osgi.testbundle.exporting.ambiguity", "3.3.3", + BundleInfoAdapter.OSGI_BUNDLE); private IvySettings settings; + private File cache; + private ResolveData data; + private Ivy ivy; + private BundleRepoResolver bundleResolver; + private BundleRepoResolver bundleUrlResolver; + private DualResolver dualResolver; - @Before public void setUp() throws Exception { settings = new IvySettings(); bundleResolver = new BundleRepoResolver(); - bundleResolver.setRepoXmlFile(new File("java/test-repo/bundlerepo/repo.xml").getAbsolutePath()); + bundleResolver.setRepoXmlFile(new File("java/test-repo/bundlerepo/repo.xml") + .getAbsolutePath()); bundleResolver.setName("bundle"); bundleResolver.setSettings(settings); settings.addResolver(bundleResolver); bundleUrlResolver = new BundleRepoResolver(); - bundleUrlResolver - .setRepoXmlURL(new File("java/test-repo/bundlerepo/repo.xml").toURI().toURL().toExternalForm()); + bundleUrlResolver.setRepoXmlURL(new File("java/test-repo/bundlerepo/repo.xml").toURI() + .toURL().toExternalForm()); bundleUrlResolver.setName("bundleurl"); bundleUrlResolver.setSettings(settings); settings.addResolver(bundleUrlResolver); @@ -112,7 +115,8 @@ public class BundleRepoResolverTest { dualResolver.setName("dual"); File ivyrepo = new File("java/test-repo/ivyrepo"); FileSystemResolver fileSystemResolver = new FileSystemResolver(); - fileSystemResolver.addIvyPattern(ivyrepo.getAbsolutePath() + "/[organisation]/[module]/[revision]/ivy.xml"); + fileSystemResolver.addIvyPattern(ivyrepo.getAbsolutePath() + + "/[organisation]/[module]/[revision]/ivy.xml"); fileSystemResolver.addArtifactPattern(ivyrepo.getAbsolutePath() + "/[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"); fileSystemResolver.setName("dual-file"); @@ -139,34 +143,33 @@ public class BundleRepoResolverTest { data = new ResolveData(ivy.getResolveEngine(), new ResolveOptions()); } - @Test public void testSimpleResolve() throws Exception { - ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "org.apache.ivy.osgi.testbundle", "1.2.3", - BundleInfoAdapter.OSGI_BUNDLE); + ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "org.apache.ivy.osgi.testbundle", + "1.2.3", BundleInfoAdapter.OSGI_BUNDLE); genericTestResolveDownload(bundleResolver, mrid); } - @Test public void testSimpleUrlResolve() throws Exception { - ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "org.apache.ivy.osgi.testbundle", "1.2.3", - BundleInfoAdapter.OSGI_BUNDLE); + ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "org.apache.ivy.osgi.testbundle", + "1.2.3", BundleInfoAdapter.OSGI_BUNDLE); genericTestResolveDownload(bundleUrlResolver, mrid); } - @Test public void testResolveDual() throws Exception { - ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "org.apache.ivy.osgi.testbundle", "1.2.3", - BundleInfoAdapter.OSGI_BUNDLE); + ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "org.apache.ivy.osgi.testbundle", + "1.2.3", BundleInfoAdapter.OSGI_BUNDLE); genericTestResolveDownload(dualResolver, mrid); } - private void genericTestResolveDownload(DependencyResolver resolver, ModuleRevisionId mrid) throws ParseException { - ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), data); + private void genericTestResolveDownload(DependencyResolver resolver, ModuleRevisionId mrid) + throws ParseException { + ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, + false), data); assertNotNull(rmr); assertEquals(mrid, rmr.getId()); Artifact artifact = rmr.getDescriptor().getAllArtifacts()[0]; - DownloadReport report = resolver.download(new Artifact[] { artifact }, new DownloadOptions()); + DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions()); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -178,7 +181,7 @@ public class BundleRepoResolverTest { assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus()); // test to ask to download again, should use cache - report = resolver.download(new Artifact[] { artifact }, new DownloadOptions()); + report = resolver.download(new Artifact[] {artifact}, new DownloadOptions()); assertNotNull(report); assertEquals(1, report.getArtifactsReports().length); @@ -190,108 +193,110 @@ public class BundleRepoResolverTest { assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } - @Test public void testResolveImporting() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing_3.2.1.jar"; - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {MRID_TEST_BUNDLE}); } - @Test public void testResolveImportingOptional() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.optional_3.2.1.jar"; - genericTestResolve(jarName, "default"); - genericTestResolve(jarName, "optional", MRID_TEST_BUNDLE); - genericTestResolve(jarName, "transitive-optional", MRID_TEST_BUNDLE); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {}); + genericTestResolve(jarName, "optional", new ModuleRevisionId[] {MRID_TEST_BUNDLE}); + genericTestResolve(jarName, "transitive-optional", + new ModuleRevisionId[] {MRID_TEST_BUNDLE}); } - @Test public void testResolveImportingTransitiveOptional() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.transitiveoptional_3.2.1.jar"; - genericTestResolve(jarName, "default"); - genericTestResolve(jarName, "optional", MRID_TEST_BUNDLE_IMPORTING_OPTIONAL); - genericTestResolve(jarName, "transitive-optional", MRID_TEST_BUNDLE, MRID_TEST_BUNDLE_IMPORTING_OPTIONAL); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {}); + genericTestResolve(jarName, "optional", + new ModuleRevisionId[] {MRID_TEST_BUNDLE_IMPORTING_OPTIONAL}); + genericTestResolve(jarName, "transitive-optional", new ModuleRevisionId[] { + MRID_TEST_BUNDLE, MRID_TEST_BUNDLE_IMPORTING_OPTIONAL}); } - @Test public void testResolveImportingVersion() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.version_3.2.1.jar"; - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {MRID_TEST_BUNDLE}); } - @Test public void testResolveImportingRangeVersion() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.rangeversion_3.2.1.jar"; - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {MRID_TEST_BUNDLE}); } - @Test public void testResolveUse() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.use_2.2.2.jar"; - genericTestResolve(jarName, "default"); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {}); } - @Test public void testResolveImportingUse() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.use_3.2.1.jar"; - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE_USE, MRID_TEST_BUNDLE_IMPORTING, MRID_TEST_BUNDLE); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {MRID_TEST_BUNDLE_USE, + MRID_TEST_BUNDLE_IMPORTING, MRID_TEST_BUNDLE}); } - @Test public void testResolveRequire() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.require_1.1.1.jar"; - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE, MRID_TEST_BUNDLE_IMPORTING_VERSION); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {MRID_TEST_BUNDLE, + MRID_TEST_BUNDLE_IMPORTING_VERSION}); } - @Test public void testResolveOptionalConf() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.require_1.1.1.jar"; - genericTestResolve(jarName, "optional", MRID_TEST_BUNDLE, MRID_TEST_BUNDLE_IMPORTING_VERSION); + genericTestResolve(jarName, "optional", new ModuleRevisionId[] {MRID_TEST_BUNDLE, + MRID_TEST_BUNDLE_IMPORTING_VERSION}); } - @Test public void testResolveImportAmbiguity() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.ambiguity_3.2.1.jar"; bundleResolver.setImportPackageStrategy(RequirementStrategy.first); - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE_EXPORTING_AMBIGUITY); + genericTestResolve(jarName, "default", + new ModuleRevisionId[] {MRID_TEST_BUNDLE_EXPORTING_AMBIGUITY}); } - @Test public void testResolveImportNoAmbiguity() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.importing.ambiguity_3.2.1.jar"; bundleResolver.setImportPackageStrategy(RequirementStrategy.noambiguity); genericTestFailingResolve(jarName, "default"); } - @Test public void testResolveRequireAmbiguity() throws Exception { String jarName = "org.apache.ivy.osgi.testbundle.require.ambiguity_1.1.1.jar"; bundleResolver.setImportPackageStrategy(RequirementStrategy.noambiguity); - genericTestResolve(jarName, "default", MRID_TEST_BUNDLE, MRID_TEST_BUNDLE_IMPORTING_VERSION); + genericTestResolve(jarName, "default", new ModuleRevisionId[] {MRID_TEST_BUNDLE, + MRID_TEST_BUNDLE_IMPORTING_VERSION}); } - private void genericTestResolve(String jarName, String conf, ModuleRevisionId... expectedMrids) throws Exception { - JarInputStream in = new JarInputStream(new FileInputStream("java/test-repo/bundlerepo/" + jarName)); + private void genericTestResolve(String jarName, String conf, ModuleRevisionId[] expectedMrids) + throws Exception { + JarInputStream in = new JarInputStream(new FileInputStream("java/test-repo/bundlerepo/" + + jarName)); BundleInfo bundleInfo = ManifestParser.parseManifest(in.getManifest()); DefaultModuleDescriptor md = BundleInfoAdapter.toModuleDescriptor(bundleInfo, null); - ResolveReport resolveReport = ivy.resolve(md, new ResolveOptions().setConfs(new String[] { conf }) - .setOutputReport(false)); - assertFalse("resolve failed " + resolveReport.getProblemMessages(), resolveReport.hasError()); - Set<ModuleRevisionId> actual = new HashSet<ModuleRevisionId>(); - @SuppressWarnings("unchecked") - List<Artifact> artifacts = resolveReport.getArtifacts(); - for (Artifact artfact : artifacts) { + ResolveReport resolveReport = ivy.resolve(md, + new ResolveOptions().setConfs(new String[] {conf}).setOutputReport(false)); + assertFalse("resolve failed " + resolveReport.getProblemMessages(), + resolveReport.hasError()); + Set/* <ModuleRevisionId> */actual = new HashSet/* <ModuleRevisionId> */(); + List/* <Artifact> */artifacts = resolveReport.getArtifacts(); + Iterator itArtfact = artifacts.iterator(); + while (itArtfact.hasNext()) { + Artifact artfact = (Artifact) itArtfact.next(); actual.add(artfact.getModuleRevisionId()); } - Set<ModuleRevisionId> expected = new HashSet<ModuleRevisionId>(Arrays.asList(expectedMrids)); + Set/* <ModuleRevisionId> */expected = new HashSet/* <ModuleRevisionId> */( + Arrays.asList(expectedMrids)); assertEquals(expected, actual); } private void genericTestFailingResolve(String jarName, String conf) throws Exception { - JarInputStream in = new JarInputStream(new FileInputStream("java/test-repo/bundlerepo/" + jarName)); + JarInputStream in = new JarInputStream(new FileInputStream("java/test-repo/bundlerepo/" + + jarName)); BundleInfo bundleInfo = ManifestParser.parseManifest(in.getManifest()); DefaultModuleDescriptor md = BundleInfoAdapter.toModuleDescriptor(bundleInfo, null); - ResolveReport resolveReport = ivy.resolve(md, new ResolveOptions().setConfs(new String[] { conf }) - .setOutputReport(false)); + ResolveReport resolveReport = ivy.resolve(md, + new ResolveOptions().setConfs(new String[] {conf}).setOutputReport(false)); assertTrue(resolveReport.hasError()); } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java Fri Nov 19 14:11:22 2010 @@ -34,16 +34,11 @@ import junit.framework.TestCase; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.osgi.obr.xml.OBRXMLParser; import org.apache.ivy.osgi.obr.xml.OBRXMLWriter; -import org.apache.ivy.osgi.repo.BundleRepo; -import org.apache.ivy.osgi.repo.FSManifestIterable; -import org.apache.ivy.osgi.repo.RepositoryManifestIterable; -import org.apache.ivy.osgi.repo.ResolverManifestIterable; import org.apache.ivy.plugins.repository.file.FileRepository; import org.apache.ivy.plugins.resolver.FileSystemResolver; import org.apache.tools.ant.BuildException; import org.xml.sax.SAXException; - public class BundleRepoTest extends TestCase { public void testFS() throws Exception { @@ -51,7 +46,8 @@ public class BundleRepoTest extends Test BundleRepo repo = new BundleRepo(); repo.populate(it); - BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream("java/test-repo/bundlerepo/repo.xml")); + BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream( + "java/test-repo/bundlerepo/repo.xml")); assertEquals(repo, repo2); } @@ -62,7 +58,8 @@ public class BundleRepoTest extends Test BundleRepo repo = new BundleRepo(); repo.populate(it); - BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream("java/test-repo/bundlerepo/repo.xml")); + BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream( + "java/test-repo/bundlerepo/repo.xml")); assertEquals(repo, repo2); } @@ -71,7 +68,8 @@ public class BundleRepoTest extends Test FileSystemResolver fileSystemResolver = new FileSystemResolver(); fileSystemResolver.setName("test"); File ivyrepo = new File("java/test-repo/ivyrepo"); - fileSystemResolver.addIvyPattern(ivyrepo.getAbsolutePath() + "/[organisation]/[module]/[revision]/ivy.xml"); + fileSystemResolver.addIvyPattern(ivyrepo.getAbsolutePath() + + "/[organisation]/[module]/[revision]/ivy.xml"); fileSystemResolver.addArtifactPattern(ivyrepo.getAbsolutePath() + "/[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"); fileSystemResolver.setSettings(new IvySettings()); @@ -79,7 +77,8 @@ public class BundleRepoTest extends Test BundleRepo repo = new BundleRepo(); repo.populate(it); - BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream("java/test-repo/ivyrepo/repo.xml")); + BundleRepo repo2 = OBRXMLParser + .parse(new FileInputStream("java/test-repo/ivyrepo/repo.xml")); assertEquals(repo, repo2); } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java Fri Nov 19 14:11:22 2010 @@ -17,17 +17,10 @@ */ package org.apache.ivy.osgi.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import junit.framework.TestCase; -import org.apache.ivy.osgi.util.ArtifactTokens; -import org.junit.Test; +public class ArtifactTokensTest extends TestCase { -public class ArtifactTokensTest { - - @Test public void testGoodMatching() { final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.datatools.connectivity.ui_1.0.1.v200808121010"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); @@ -38,7 +31,6 @@ public class ArtifactTokensTest { assertFalse(tokens.isJar); } - @Test public void testGoodMatching2() { final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.datatools.connectivity.ui_1.0.1"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); @@ -49,7 +41,6 @@ public class ArtifactTokensTest { assertFalse(tokens.isJar); } - @Test public void testGoodMatching3() { final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.myorg.module.one_3.21.100.v20070530"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); @@ -60,10 +51,10 @@ public class ArtifactTokensTest { assertFalse(tokens.isJar); } - @Test public void testGoodMatching4() { final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.mylyn.tasks.ui_3.0.1.v20080721-2100-e33.jar"; - // String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.mylyn.tasks.ui_3.0.1.v20080721.jar"; + // String repoResource = + // "java/test-ivy/osgi/eclipse/plugins/org.eclipse.mylyn.tasks.ui_3.0.1.v20080721.jar"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); assertEquals("java/test-ivy/osgi/eclipse/plugins/", tokens.prefix); assertEquals("org.eclipse.mylyn.tasks.ui", tokens.module); @@ -72,7 +63,6 @@ public class ArtifactTokensTest { assertTrue(tokens.isJar); } - @Test public void testBadMatching() { final String repoResource = "java/test-ivy/osgi/eclipse/plugins/fake"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/NameUtilTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/NameUtilTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/NameUtilTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/NameUtilTest.java Fri Nov 19 14:11:22 2010 @@ -17,59 +17,47 @@ */ package org.apache.ivy.osgi.util; -import static org.junit.Assert.*; +import junit.framework.TestCase; -import org.apache.ivy.osgi.util.NameUtil; import org.apache.ivy.osgi.util.NameUtil.OrgAndName; -import org.junit.*; +public class NameUtilTest extends TestCase { -public class NameUtilTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test public void testAsOrgAndName() { OrgAndName oan; - + oan = NameUtil.instance().asOrgAndName("foo"); assertEquals("foo", oan.org); assertEquals("foo", oan.name); - + oan = NameUtil.instance().asOrgAndName("java.foo"); assertEquals("java", oan.org); assertEquals("foo", oan.name); - + oan = NameUtil.instance().asOrgAndName("java.foo.bar"); assertEquals("java", oan.org); assertEquals("foo.bar", oan.name); - + oan = NameUtil.instance().asOrgAndName("javax.foo"); assertEquals("javax", oan.org); assertEquals("foo", oan.name); - + oan = NameUtil.instance().asOrgAndName("javax.foo.bar"); assertEquals("javax", oan.org); assertEquals("foo.bar", oan.name); - + oan = NameUtil.instance().asOrgAndName("org.eclipse.foo"); assertEquals("org.eclipse", oan.org); assertEquals("foo", oan.name); - + oan = NameUtil.instance().asOrgAndName("org.eclipse.foo.bar"); assertEquals("org.eclipse", oan.org); assertEquals("foo.bar", oan.name); - + oan = NameUtil.instance().asOrgAndName("com.eclipse.foo.bar"); assertEquals("com.eclipse", oan.org); assertEquals("foo.bar", oan.name); - + oan = NameUtil.instance().asOrgAndName("net.eclipse.foo.bar"); assertEquals("net.eclipse", oan.org); assertEquals("foo.bar", oan.name); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java Fri Nov 19 14:11:22 2010 @@ -17,17 +17,13 @@ */ package org.apache.ivy.osgi.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import junit.framework.TestCase; -import org.apache.ivy.osgi.util.ParseUtil; -import org.junit.Test; +public class ParseUtilTest extends TestCase { -public class ParseUtilTest { - - @Test public void testParse() { - final String[] result = ParseUtil.parseDelimitedString("bravo;bundle-version=\"1.0.0\", delta;bundle-version=\"1.0.0\"", ","); + final String[] result = ParseUtil.parseDelimitedString( + "bravo;bundle-version=\"1.0.0\", delta;bundle-version=\"1.0.0\"", ","); assertNotNull(result); assertEquals(2, result.length); assertEquals("bravo;bundle-version=\"1.0.0\"", result[0]); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java Fri Nov 19 14:11:22 2010 @@ -17,34 +17,29 @@ */ package org.apache.ivy.osgi.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import junit.framework.TestCase; -import org.apache.ivy.osgi.util.Version; -import org.apache.ivy.osgi.util.VersionRange; -import org.junit.Test; +public class VersionRangeTest extends TestCase { -public class VersionRangeTest { - - @Test public void testParse() throws Exception { - assertEquals(new VersionRange(false, new Version("1.0.0"), false, null), new VersionRange("1.0.0")); - assertEquals(new VersionRange(false, new Version("1.0.0"), false, null), new VersionRange(" 1.0.0 ")); - - assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), new VersionRange( - "[1.0.0,2.0.0]")); - assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), new VersionRange( - "[1.0.0 , 2.0.0]")); - assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), new VersionRange( - " [1.0.0,2.0.0] ")); - assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), new VersionRange( - "[ 1.0.0,2.0.0 ]")); + assertEquals(new VersionRange(false, new Version("1.0.0"), false, null), new VersionRange( + "1.0.0")); + assertEquals(new VersionRange(false, new Version("1.0.0"), false, null), new VersionRange( + " 1.0.0 ")); + + assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), + new VersionRange("[1.0.0,2.0.0]")); + assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), + new VersionRange("[1.0.0 , 2.0.0]")); + assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), + new VersionRange(" [1.0.0,2.0.0] ")); + assertEquals(new VersionRange(false, new Version("1.0.0"), false, new Version("2.0.0")), + new VersionRange("[ 1.0.0,2.0.0 ]")); - assertEquals(new VersionRange(false, new Version("1.0.0.A"), false, null), new VersionRange("1.0.0.A")); + assertEquals(new VersionRange(false, new Version("1.0.0.A"), false, null), + new VersionRange("1.0.0.A")); } - @Test public void testContains() throws Exception { assertFalse(new VersionRange("1").contains("0.9")); assertTrue(new VersionRange("1").contains("1")); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java?rev=1036857&r1=1036856&r2=1036857&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java Fri Nov 19 14:11:22 2010 @@ -17,15 +17,10 @@ */ package org.apache.ivy.osgi.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import junit.framework.TestCase; -import org.apache.ivy.osgi.util.Version; -import org.junit.Test; +public class VersionTest extends TestCase { -public class VersionTest { - - @Test public void testParsing() { Version v; @@ -46,7 +41,6 @@ public class VersionTest { assertEquals("abc", v.qualifier()); } - @Test public void testCompareTo() { assertTrue(new Version("1.2.3").compareTo(new Version("1.2.3")) == 0);
