From e0091b3f6f69db570207623abb4988e7b3b55ca6 Mon Sep 17 00:00:00 2001 From: Nicolas Lalevee Date: Fri, 19 Nov 2010 14:13:40 +0000 Subject: [PATCH] Setup of the unit tests of the OSGi mapping git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1036863 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 9 +++++++-- ivy.xml | 5 +++-- .../ivy/osgi/ivy/IvyIntegrationTest.java | 2 +- .../osgi/ivy/JarHandlingRepositoryTest.java | 2 +- .../ivy/osgi/ivy/OsgiIvyParserTest.java | 6 +++--- .../ivy/osgi/ivy/OsgiManifestParserTest.java | 2 +- .../apache/ivy/osgi/obr/OBRParserTest.java | 2 +- .../ivy/osgi/repo/BundleRepoResolverTest.java | 12 +++++------ .../apache/ivy/osgi/repo/BundleRepoTest.java | 14 ++++++------- .../ivy/osgi/util/ArtifactTokensTest.java | 20 +++++++++---------- test/test-bundles/build.xml | 6 ++++-- test/test-repo/build.xml | 4 +--- 12 files changed, 45 insertions(+), 39 deletions(-) diff --git a/build.xml b/build.xml index e00f0ef2..abd527b9 100644 --- a/build.xml +++ b/build.xml @@ -426,8 +426,13 @@ - - + + + + + + + - + + - + diff --git a/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java b/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java index 5f85334b..3baabf0a 100644 --- a/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java +++ b/test/java/org/apache/ivy/osgi/ivy/IvyIntegrationTest.java @@ -37,7 +37,7 @@ import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParserTester; public class IvyIntegrationTest extends AbstractModuleDescriptorParserTester { private URL getTestResource(String resource) throws MalformedURLException { - return new File("java/test-ivy/" + resource).toURI().toURL(); + return new File("test/test-ivy/" + resource).toURI().toURL(); } public void testAcmeResolveAlpha() throws Exception { diff --git a/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java b/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java index 8818b5f3..c2e8d62c 100644 --- a/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java +++ b/test/java/org/apache/ivy/osgi/ivy/JarHandlingRepositoryTest.java @@ -27,7 +27,7 @@ public class JarHandlingRepositoryTest extends TestCase { 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"); + "test/test-bundles/jars/com.acme.alpha-1.0.0.20080101.jar!META-INF/MANIFEST.MF"); assertNotNull(resource.openStream()); assertTrue(resource.isLocal()); assertTrue(resource.exists()); diff --git a/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java b/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java index 594f4bf5..0bf218b3 100644 --- a/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java +++ b/test/java/org/apache/ivy/osgi/ivy/OsgiIvyParserTest.java @@ -34,10 +34,10 @@ public class OsgiIvyParserTest extends TestCase { public void testSimple() throws Exception { IvySettings settings = new IvySettings(); - settings.load(new File("java/test-ivy/include/ivysettings.xml")); + settings.load(new File("test/test-ivy/include/ivysettings.xml")); URLResource includingResource = new URLResource( - new File("java/test-ivy/include/ivy.xml").toURL()); + new File("test/test-ivy/include/ivy.xml").toURL()); ModuleDescriptorParser includingParser = ModuleDescriptorParserRegistry.getInstance() .getParser(includingResource); assertTrue(includingParser instanceof OsgiIvyParser); @@ -47,7 +47,7 @@ public class OsgiIvyParserTest extends TestCase { assertNotNull(includingMd); URLResource resultResource = new URLResource(new File( - "java/test-ivy/include/ivy-result.xml").toURL()); + "test/test-ivy/include/ivy-result.xml").toURL()); ModuleDescriptorParser resultParser = ModuleDescriptorParserRegistry.getInstance() .getParser(resultResource); ModuleDescriptor resultMd = resultParser.parseDescriptor(settings, resultResource.getURL(), diff --git a/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java b/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java index 0dddbef1..f968a2b1 100644 --- a/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java +++ b/test/java/org/apache/ivy/osgi/ivy/OsgiManifestParserTest.java @@ -42,7 +42,7 @@ import org.apache.ivy.util.FileUtil; public class OsgiManifestParserTest extends AbstractModuleDescriptorParserTester { private URL getTestResource(String resource) throws MalformedURLException { - return new File("java/test-ivy/" + resource).toURI().toURL(); + return new File("test/test-ivy/" + resource).toURI().toURL(); } public void testAccept() throws Exception { diff --git a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java index ffd60ded..6ef203e3 100644 --- a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java +++ b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java @@ -31,7 +31,7 @@ public class OBRParserTest extends TestCase { public void testParse() throws Exception { BundleRepo repo = OBRXMLParser - .parse(new FileInputStream(new File("java/test-obr/obr.xml"))); + .parse(new FileInputStream(new File("test/test-obr/obr.xml"))); assertNotNull(repo); System.out.println(repo.getBundles().size() + " bundles successfully parsed, " + Message.getProblems().size() + " errors"); diff --git a/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java b/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java index 37958e0a..8216164d 100644 --- a/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java +++ b/test/java/org/apache/ivy/osgi/repo/BundleRepoResolverTest.java @@ -93,14 +93,14 @@ public class BundleRepoResolverTest extends TestCase { settings = new IvySettings(); bundleResolver = new BundleRepoResolver(); - bundleResolver.setRepoXmlFile(new File("java/test-repo/bundlerepo/repo.xml") + bundleResolver.setRepoXmlFile(new File("test/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() + bundleUrlResolver.setRepoXmlURL(new File("test/test-repo/bundlerepo/repo.xml").toURI() .toURL().toExternalForm()); bundleUrlResolver.setName("bundleurl"); bundleUrlResolver.setSettings(settings); @@ -108,12 +108,12 @@ public class BundleRepoResolverTest extends TestCase { dualResolver = new DualResolver(); BundleRepoResolver resolver = new BundleRepoResolver(); - resolver.setRepoXmlFile("java/test-repo/ivyrepo/repo.xml"); + resolver.setRepoXmlFile("test/test-repo/ivyrepo/repo.xml"); resolver.setName("dual-bundle"); resolver.setSettings(settings); dualResolver.add(resolver); dualResolver.setName("dual"); - File ivyrepo = new File("java/test-repo/ivyrepo"); + File ivyrepo = new File("test/test-repo/ivyrepo"); FileSystemResolver fileSystemResolver = new FileSystemResolver(); fileSystemResolver.addIvyPattern(ivyrepo.getAbsolutePath() + "/[organisation]/[module]/[revision]/ivy.xml"); @@ -270,7 +270,7 @@ public class BundleRepoResolverTest extends TestCase { private void genericTestResolve(String jarName, String conf, ModuleRevisionId[] expectedMrids) throws Exception { - JarInputStream in = new JarInputStream(new FileInputStream("java/test-repo/bundlerepo/" + JarInputStream in = new JarInputStream(new FileInputStream("test/test-repo/bundlerepo/" + jarName)); BundleInfo bundleInfo = ManifestParser.parseManifest(in.getManifest()); DefaultModuleDescriptor md = BundleInfoAdapter.toModuleDescriptor(bundleInfo, null); @@ -291,7 +291,7 @@ public class BundleRepoResolverTest extends TestCase { } private void genericTestFailingResolve(String jarName, String conf) throws Exception { - JarInputStream in = new JarInputStream(new FileInputStream("java/test-repo/bundlerepo/" + JarInputStream in = new JarInputStream(new FileInputStream("test/test-repo/bundlerepo/" + jarName)); BundleInfo bundleInfo = ManifestParser.parseManifest(in.getManifest()); DefaultModuleDescriptor md = BundleInfoAdapter.toModuleDescriptor(bundleInfo, null); diff --git a/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java b/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java index 5bf407a6..9da85fd5 100644 --- a/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java +++ b/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java @@ -42,24 +42,24 @@ import org.xml.sax.SAXException; public class BundleRepoTest extends TestCase { public void testFS() throws Exception { - FSManifestIterable it = new FSManifestIterable(new File("java/test-repo/bundlerepo"), ""); + FSManifestIterable it = new FSManifestIterable(new File("test/test-repo/bundlerepo"), ""); BundleRepo repo = new BundleRepo(); repo.populate(it); BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream( - "java/test-repo/bundlerepo/repo.xml")); + "test/test-repo/bundlerepo/repo.xml")); assertEquals(repo, repo2); } public void testFileRepo() throws Exception { RepositoryManifestIterable it = new RepositoryManifestIterable(new FileRepository(new File( - "java/test-repo/bundlerepo"))); + "test/test-repo/bundlerepo"))); BundleRepo repo = new BundleRepo(); repo.populate(it); BundleRepo repo2 = OBRXMLParser.parse(new FileInputStream( - "java/test-repo/bundlerepo/repo.xml")); + "test/test-repo/bundlerepo/repo.xml")); assertEquals(repo, repo2); } @@ -67,7 +67,7 @@ public class BundleRepoTest extends TestCase { public void testResolver() throws Exception { FileSystemResolver fileSystemResolver = new FileSystemResolver(); fileSystemResolver.setName("test"); - File ivyrepo = new File("java/test-repo/ivyrepo"); + File ivyrepo = new File("test/test-repo/ivyrepo"); fileSystemResolver.addIvyPattern(ivyrepo.getAbsolutePath() + "/[organisation]/[module]/[revision]/ivy.xml"); fileSystemResolver.addArtifactPattern(ivyrepo.getAbsolutePath() @@ -78,13 +78,13 @@ public class BundleRepoTest extends TestCase { repo.populate(it); BundleRepo repo2 = OBRXMLParser - .parse(new FileInputStream("java/test-repo/ivyrepo/repo.xml")); + .parse(new FileInputStream("test/test-repo/ivyrepo/repo.xml")); assertEquals(repo, repo2); } public void testXMLSerialisation() throws SAXException, ParseException, IOException { - FSManifestIterable it = new FSManifestIterable(new File("java/test-repo/bundlerepo"), ""); + FSManifestIterable it = new FSManifestIterable(new File("test/test-repo/bundlerepo"), ""); BundleRepo repo = new BundleRepo(); repo.populate(it); diff --git a/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java b/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java index b0289145..40f8b53d 100644 --- a/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java +++ b/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java @@ -22,9 +22,9 @@ import junit.framework.TestCase; public class ArtifactTokensTest extends TestCase { public void testGoodMatching() { - final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.datatools.connectivity.ui_1.0.1.v200808121010"; + final String repoResource = "test/test-ivy/osgi/eclipse/plugins/org.eclipse.datatools.connectivity.ui_1.0.1.v200808121010"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); - assertEquals("java/test-ivy/osgi/eclipse/plugins/", tokens.prefix); + assertEquals("test/test-ivy/osgi/eclipse/plugins/", tokens.prefix); assertEquals("org.eclipse.datatools.connectivity.ui", tokens.module); assertEquals("1.0.1", tokens.version.numbersAsString()); assertEquals("v200808121010", tokens.version.qualifier()); @@ -32,9 +32,9 @@ public class ArtifactTokensTest extends TestCase { } public void testGoodMatching2() { - final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.datatools.connectivity.ui_1.0.1"; + final String repoResource = "test/test-ivy/osgi/eclipse/plugins/org.eclipse.datatools.connectivity.ui_1.0.1"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); - assertEquals("java/test-ivy/osgi/eclipse/plugins/", tokens.prefix); + assertEquals("test/test-ivy/osgi/eclipse/plugins/", tokens.prefix); assertEquals("org.eclipse.datatools.connectivity.ui", tokens.module); assertEquals("1.0.1", tokens.version.numbersAsString()); assertEquals("", tokens.version.qualifier()); @@ -42,9 +42,9 @@ public class ArtifactTokensTest extends TestCase { } public void testGoodMatching3() { - final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.myorg.module.one_3.21.100.v20070530"; + final String repoResource = "test/test-ivy/osgi/eclipse/plugins/org.myorg.module.one_3.21.100.v20070530"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); - assertEquals("java/test-ivy/osgi/eclipse/plugins/", tokens.prefix); + assertEquals("test/test-ivy/osgi/eclipse/plugins/", tokens.prefix); assertEquals("org.myorg.module.one", tokens.module); assertEquals("3.21.100", tokens.version.numbersAsString()); assertEquals("v20070530", tokens.version.qualifier()); @@ -52,11 +52,11 @@ public class ArtifactTokensTest extends TestCase { } public void testGoodMatching4() { - final String repoResource = "java/test-ivy/osgi/eclipse/plugins/org.eclipse.mylyn.tasks.ui_3.0.1.v20080721-2100-e33.jar"; + final String repoResource = "test/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"; + // "test/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("test/test-ivy/osgi/eclipse/plugins/", tokens.prefix); assertEquals("org.eclipse.mylyn.tasks.ui", tokens.module); assertEquals("3.0.1", tokens.version.numbersAsString()); assertEquals("v20080721-2100-e33", tokens.version.qualifier()); @@ -64,7 +64,7 @@ public class ArtifactTokensTest extends TestCase { } public void testBadMatching() { - final String repoResource = "java/test-ivy/osgi/eclipse/plugins/fake"; + final String repoResource = "test/test-ivy/osgi/eclipse/plugins/fake"; final ArtifactTokens tokens = new ArtifactTokens(repoResource); assertNull(tokens.prefix); assertNull(tokens.module); diff --git a/test/test-bundles/build.xml b/test/test-bundles/build.xml index d0a1216d..4bdd7f32 100644 --- a/test/test-bundles/build.xml +++ b/test/test-bundles/build.xml @@ -71,6 +71,7 @@ + @@ -85,13 +86,14 @@ - + + - + \ No newline at end of file diff --git a/test/test-repo/build.xml b/test/test-repo/build.xml index 36a6b425..0d15b5d0 100644 --- a/test/test-repo/build.xml +++ b/test/test-repo/build.xml @@ -18,11 +18,9 @@ --> - - - +