Author: thomas.diesler(a)jboss.com Date: 2009-09-29 17:19:02 -0400 (Tue, 29 Sep 2009) New Revision: 94122 Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BndTestCase.java projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/asm.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ds.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ecj_3.2.2.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ifc112.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/jquantlib-0.1.2.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.bnd projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/osgi.jar projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/JobsService.clazz projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/Parser.jclass projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/Test2.jclass projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/WithAnnotations.jclass projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/XDbCmpXView.clazz projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/bnd.info projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/craptest/ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/craptest/crap/ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/craptest/crap/Simple.class projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/generics.clazz Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnalyzerTest.java projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnnotationsTest.java projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AttributesTest.java projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BuilderTest.java projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/ClassParserTest.java projects/jboss-osgi/projects/aQute/trunk/libg/pom.xml projects/jboss-osgi/projects/aQute/trunk/pom.xml projects/jboss-osgi/projects/aQute/trunk/runtime/pom.xml projects/jboss-osgi/projects/aQute/trunk/service/pom.xml Log: Add more test resources Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/pom.xml 2009-09-29 21:19:02 UTC (rev 94122) @@ -17,13 +17,13 @@ <name>aQute - Bnd</name> <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> + <artifactId>aQute.bnd</artifactId> <packaging>bundle</packaging> <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>parent</artifactId> + <artifactId>aQute.parent</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> @@ -33,17 +33,17 @@ <!-- aQute --> <dependency> <groupId>biz.aQute</groupId> - <artifactId>libg</artifactId> + <artifactId>aQute.libg</artifactId> <version>${version}</version> </dependency> <dependency> <groupId>biz.aQute</groupId> - <artifactId>service</artifactId> + <artifactId>aQute.service</artifactId> <version>${version}</version> </dependency> <dependency> <groupId>biz.aQute</groupId> - <artifactId>runtime</artifactId> + <artifactId>aQute.runtime</artifactId> <version>${version}</version> </dependency> @@ -273,7 +273,7 @@ <Include-Resource> LICENSE=${project.build.outputDirectory}/LICENSE, plugin.xml=${project.build.outputDirectory}/plugin.xml, - aQute/bnd/test/aQute.runtime.jar=${project.build.directory}/assembly/runtime.jar, + aQute/bnd/test/aQute.runtime.jar=${project.build.directory}/assembly/aQute.runtime.jar, </Include-Resource> <Export-Package> aQute.bnd.build;uses:="aQute.lib.osgi,aQute.libg.sed,aQute.bnd.service,aQute.libg.reporter,aQute.bnd.service.action", @@ -395,11 +395,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>test/AnalyzerTest.java</exclude> - <exclude>test/AnnotationsTest.java</exclude> - <exclude>test/AttributesTest.java</exclude> <exclude>test/BuilderTest.java</exclude> - <exclude>test/ClassParserTest.java</exclude> <exclude>test/ClasspathTest.java</exclude> <exclude>test/ClassReferenceTest.java</exclude> <exclude>test/DiffTest.java</exclude> Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/scripts/assembly-dependencies.xml 2009-09-29 21:19:02 UTC (rev 94122) @@ -14,7 +14,7 @@ <outputDirectory>/</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:runtime:jar</include> + <include>*:aQute.runtime:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <unpack>false</unpack> Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnalyzerTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnalyzerTest.java 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnalyzerTest.java 2009-09-29 21:19:02 UTC (rev 94122) @@ -1,11 +1,21 @@ package test; -import java.io.*; -import java.util.*; -import java.util.jar.*; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.TreeSet; +import java.util.jar.Attributes; +import java.util.jar.Manifest; -import junit.framework.*; -import aQute.lib.osgi.*; +import aQute.lib.osgi.Analyzer; +import aQute.lib.osgi.Builder; +import aQute.lib.osgi.FileResource; +import aQute.lib.osgi.Jar; +import aQute.lib.osgi.Processor; class T0 {} abstract class T1 extends T0 { @@ -17,11 +27,11 @@ class T3 extends T2 { } -public class AnalyzerTest extends TestCase { +public class AnalyzerTest extends BndTestCase { public void testMultilevelInheritance() throws Exception { Analyzer a = new Analyzer(); - a.setJar(new File("bin")); + a.setJar(getFile(".")); a.analyze(); String result = a._classes("cmd", "named", "*T?", "extends", @@ -33,7 +43,7 @@ public void testClassQuery() throws Exception { Analyzer a = new Analyzer(); - a.setJar(new File("jar/osgi.jar")); + a.setJar(getFile("jar/osgi.jar")); a.analyze(); String result = a._classes("cmd", "named", "org.osgi.service.http.*", @@ -53,7 +63,7 @@ Builder a = new Builder(); a.setProperty("Bundle-Blueprint", " <<EMPTY>> "); a.setProperty("Export-Package", "org.osgi.framework"); - a.addClasspath(new File("jar/osgi.jar")); + a.addClasspath(getFile("jar/osgi.jar")); a.build(); Manifest manifest = a.getJar().getManifest(); System.out.println(a.getErrors()); @@ -74,7 +84,7 @@ Builder a = new Builder(); a.setProperty("Export-Package", "org.osgi.service.event, org.osgi.service.io"); - a.addClasspath(new File("jar/osgi.jar")); + a.addClasspath(getFile("jar/osgi.jar")); a.setProperty("@org@osgi@service@event@Specification-Title", "spec title"); a.setProperty("@org@osgi@service@io@Specification-Title", @@ -107,8 +117,7 @@ Properties p = new Properties(); p.put("Import-Package", "*"); p.put("Private-Package", "org.apache.mina.management.*"); - a.setClasspath(new Jar[] { new Jar(new File( - "jar/mandatorynoversion.jar")) }); + a.setClasspath(new Jar[] { new Jar(getFile("jar/mandatorynoversion.jar")) }); a.setProperties(p); Jar jar = a.build(); String imports = jar.getManifest().getMainAttributes().getValue( @@ -129,7 +138,7 @@ p.put("Import-Package", "*"); p.put("Private-Package", "org.objectweb.*"); p.put("Bundle-Activator", "org.objectweb.asm.Item"); - a.setClasspath(new Jar[] { new Jar(new File("jar/asm.jar")) }); + a.setClasspath(new Jar[] { new Jar(getFile("jar/asm.jar")) }); a.setProperties(p); a.build(); Manifest manifest = a.getJar().getManifest(); @@ -155,8 +164,8 @@ p.put("Import-Package", "!org.osgi.framework,*"); p.put("Private-Package", "org.objectweb.*"); p.put("Bundle-Activator", "org.osgi.framework.BundleActivator"); - a.setClasspath(new Jar[] { new Jar(new File("jar/asm.jar")), - new Jar(new File("jar/osgi.jar")) }); + a.setClasspath(new Jar[] { new Jar(getFile("jar/asm.jar")), + new Jar(getFile("jar/osgi.jar")) }); a.setProperties(p); a.build(); Manifest manifest = a.getJar().getManifest(); @@ -182,8 +191,8 @@ Properties p = new Properties(); p.put("Private-Package", "org.objectweb.*"); p.put("Bundle-Activator", "org.osgi.framework.BundleActivator"); - a.setClasspath(new Jar[] { new Jar(new File("jar/asm.jar")), - new Jar(new File("jar/osgi.jar")) }); + a.setClasspath(new Jar[] { new Jar(getFile("jar/asm.jar")), + new Jar(getFile("jar/osgi.jar")) }); a.setProperties(p); a.build(); Manifest manifest = a.getJar().getManifest(); @@ -204,11 +213,11 @@ public void testRemoveheaders() throws Exception { Analyzer a = new Analyzer(); - a.setJar(new File("jar/asm.jar")); + a.setJar(getFile("jar/asm.jar")); Manifest m = a.calcManifest(); assertNotNull(m.getMainAttributes().getValue("Implementation-Title")); a = new Analyzer(); - a.setJar(new File("jar/asm.jar")); + a.setJar(getFile("jar/asm.jar")); a.setProperty("-removeheaders", "Implementation-Title"); m = a.calcManifest(); assertNull(m.getMainAttributes().getValue("Implementation-Title")); @@ -242,7 +251,7 @@ * */ public void testAsm3() throws Exception { - Properties p = Analyzer.getManifest(new File("jar/asm.jar")); + Properties p = Analyzer.getManifest(getFile("jar/asm.jar")); String imports = p.getProperty(Analyzer.IMPORT_PACKAGE); String exports = p.getProperty(Analyzer.EXPORT_PACKAGE); @@ -272,7 +281,7 @@ base.put(Analyzer.EXPORT_PACKAGE, "*;-noimport:=true"); Analyzer analyzer = new Analyzer(); - analyzer.setJar(new File("jar/asm.jar")); + analyzer.setJar(getFile("jar/asm.jar")); analyzer.setProperties(base); analyzer.calcManifest().write(System.out); assertTrue(analyzer.getExports().containsKey( @@ -296,7 +305,7 @@ .put(Analyzer.EXPORT_PACKAGE, "org.objectweb.asm;name=short, org.objectweb.asm.signature;name=long"); Analyzer h = new Analyzer(); - h.setJar(new File("jar/asm.jar")); + h.setJar(getFile("jar/asm.jar")); h.setProperties(base); h.calcManifest().write(System.out); assertPresent(h.getExports(), @@ -313,7 +322,7 @@ Properties base = new Properties(); base.put(Analyzer.IMPORT_PACKAGE, "*"); base.put(Analyzer.EXPORT_PACKAGE, "*;-noimport:=true"); - File tmp = new File("jar/ds.jar"); + File tmp = getFile("jar/ds.jar"); Analyzer analyzer = new Analyzer(); analyzer.setJar(tmp); analyzer.setProperties(base); @@ -337,7 +346,7 @@ Properties base = new Properties(); base.put(Analyzer.IMPORT_PACKAGE, "!org.osgi.*, *"); base.put(Analyzer.EXPORT_PACKAGE, "*;-noimport:=true"); - File tmp = new File("jar/ds.jar"); + File tmp = getFile("jar/ds.jar"); Analyzer h = new Analyzer(); h.setJar(tmp); h.setProperties(base); @@ -363,7 +372,7 @@ Properties base = new Properties(); base.put(Analyzer.IMPORT_PACKAGE, "*"); base.put(Analyzer.EXPORT_PACKAGE, "!*"); - File tmp = new File("jar/ds.jar"); + File tmp = getFile("jar/ds.jar"); Analyzer h = new Analyzer(); h.setJar(tmp); h.setProperties(base); @@ -387,8 +396,8 @@ Properties base = new Properties(); base.put(Analyzer.IMPORT_PACKAGE, "*"); base.put(Analyzer.EXPORT_PACKAGE, "*;-noimport:=true"); - File tmp = new File("jar/ds.jar"); - File osgi = new File("jar/osgi.jar"); + File tmp = getFile("jar/ds.jar"); + File osgi = getFile("jar/osgi.jar"); Analyzer h = new Analyzer(); h.setJar(tmp); h.setProperties(base); @@ -416,7 +425,7 @@ Properties base = new Properties(); base.put(Analyzer.IMPORT_PACKAGE, "*, com.foo, com.foo.bar.*"); base.put(Analyzer.EXPORT_PACKAGE, "*, com.bar"); - File tmp = new File("jar/ds.jar"); + File tmp = getFile("jar/ds.jar"); Analyzer h = new Analyzer(); h.setJar(tmp); h.setProperties(base); @@ -430,7 +439,7 @@ assertTrue(h.getImports().containsKey("com.foo")); } - void assertNotPresent(Map<String, ?> map, String string) { + void assertNotPresent(Map<String, ?> map, String string) { StringTokenizer st = new StringTokenizer(string, ", "); while (st.hasMoreTokens()) { String packageName = st.nextToken(); Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnnotationsTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnnotationsTest.java 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AnnotationsTest.java 2009-09-29 21:19:02 UTC (rev 94122) @@ -1,18 +1,25 @@ package test; -import java.io.*; -import java.util.*; -import java.util.jar.*; +import java.io.File; +import java.io.Serializable; +import java.util.Arrays; +import java.util.jar.Manifest; -import junit.framework.*; +import org.osgi.service.log.LogService; -import org.osgi.service.log.*; +import aQute.bnd.annotation.Activate; +import aQute.bnd.annotation.Component; +import aQute.bnd.annotation.Reference; +import aQute.bnd.annotation.Unreference; +import aQute.bnd.make.AnnotationReader; +import aQute.bnd.make.ComponentDef; +import aQute.lib.osgi.Annotation; +import aQute.lib.osgi.Builder; +import aQute.lib.osgi.ClassDataCollector; +import aQute.lib.osgi.Clazz; +import aQute.lib.osgi.Jar; -import aQute.bnd.annotation.*; -import aQute.bnd.make.*; -import aQute.lib.osgi.*; - -public class AnnotationsTest extends TestCase { +public class AnnotationsTest extends BndTestCase { @Component(name="mycomp", enabled=true, factory="usb", immediate=false, provides=LogService.class, serviceFactory=true) static class MyComponent implements Serializable { @@ -34,7 +41,7 @@ public void testComponentReader() throws Exception { - File f = new File("bin/test/AnnotationsTest$MyComponent.class"); + File f = getFile("test/AnnotationsTest$MyComponent.class"); ComponentDef def = AnnotationReader.getComponentDef(f); def.append(System.out); @@ -45,11 +52,11 @@ public void testComponentAnnotation() throws Exception { Builder b = new Builder(); b.setProperty("Private-Package", "test"); - b.addClasspath( new File("bin")); + b.addClasspath( getFile(".")); Jar jar = b.build(); Manifest m = jar.getManifest(); - // assert + // [TODO] assert } public void testSimple() throws Exception { Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AttributesTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AttributesTest.java 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/AttributesTest.java 2009-09-29 21:19:02 UTC (rev 94122) @@ -7,7 +7,7 @@ import junit.framework.*; import aQute.lib.osgi.*; -public class AttributesTest extends TestCase { +public class AttributesTest extends BndTestCase { /** * Remove a version attribute @@ -22,7 +22,7 @@ m.getMainAttributes().putValue("Export-Package", "javax.microedition.io;a1=exp-1;a2=exp-2;a3=exp-3;x1=x1;x2=x2;x3=x3;mandatory:=\"a1,a2,a3,x1,x2,x3\""); javax.setManifest(m); - Jar cp[] = { javax, new Jar(new File("jar/osgi.jar")) }; + Jar cp[] = { javax, new Jar(getFile("jar/osgi.jar")) }; Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", "javax.microedition.io;-remove-attribute:=a1|x?;a2=imp-2,*"); @@ -60,7 +60,7 @@ m.getMainAttributes().putValue("Export-Package", "javax.microedition.io;common=split;test=abc;mandatory:=\"common,test\""); javax.setManifest(m); - Jar cp[] = { javax, new Jar(new File("jar/osgi.jar")) }; + Jar cp[] = { javax, new Jar(getFile("jar/osgi.jar")) }; Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", "javax.microedition.io;common=!;test=abc,*"); @@ -89,7 +89,7 @@ * @throws Exception */ public void testOverrideAttribute() throws Exception { - File cp[] = { new File("jar/osgi.jar") }; + File cp[] = { getFile("jar/osgi.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Export-Package", "org.osgi.framework;version=1.1"); @@ -116,7 +116,7 @@ * @throws Exception */ public void testSimple() throws Exception { - File cp[] = { new File("jar/osgi.jar") }; + File cp[] = { getFile("jar/osgi.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Export-Package", "org.osgi.framework"); Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BndTestCase.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BndTestCase.java (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BndTestCase.java 2009-09-29 21:19:02 UTC (rev 94122) @@ -0,0 +1,20 @@ +package test; + +import java.io.File; + +import junit.framework.TestCase; + +/** + * An abstract test base class for common functionality + * + * @author thomas.diesler(a)jboss.com + * @since 29-Sep-2009 + */ +public abstract class BndTestCase extends TestCase { + + protected File getFile(String path) { + File file = new File("target/test-classes/" + path); + assertTrue("File exists: " + path, file.exists()); + return file; + } +} Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BuilderTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BuilderTest.java 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/BuilderTest.java 2009-09-29 21:19:02 UTC (rev 94122) @@ -7,13 +7,12 @@ import junit.framework.*; import aQute.lib.osgi.*; -public class BuilderTest extends TestCase { +public class BuilderTest extends BndTestCase { public void testExtra() throws Exception { Builder b = new Builder(); - b - .setProperty("Include-Resource", - "jar/osgi.jar;extra=itworks, www/xyz.jar=jar/osgi.jar;extra='italsoworks'"); + b.setProperty("Include-Resource", + getFile("jar/osgi.jar") + ";extra=itworks, www/xyz.jar=" + getFile("jar/osgi.jar") + ";extra='italsoworks'"); b.setProperty("-resourceonly", "true"); Jar jar = b.build(); Resource r = jar.getResource("osgi.jar"); @@ -39,7 +38,7 @@ */ public void testSplitWhenPrivateOverlapsExport() throws Exception { Builder b = new Builder(); - b.addClasspath(new File("jar/osgi.jar")); + b.addClasspath(getFile("jar/osgi.jar")); b.setProperty("Private-Package", "org.osgi.service.*"); b.setProperty("Export-Package", "org.osgi.service.event"); b.build(); @@ -72,7 +71,7 @@ "org.osgi.service.wireadmin, org.osgi.service.log, org.osgi.service.cu"); proc.setProperty("mobile.packages", "${replace;${mobile.specs};.+;$0.*}"); - builder.addClasspath(new File("jar/osgi.jar")); + builder.addClasspath(getFile("jar/osgi.jar")); Jar jar = builder.build(); @@ -99,7 +98,7 @@ b.setProperty("Import-Package", "*;resolution:=\\${res}"); b.setProperty("Export-Package", "org.osgi.service.io, org.osgi.service.log"); - b.addClasspath(new File("jar/osgi.jar")); + b.addClasspath(getFile("jar/osgi.jar")); b.build(); Map<String, String> ioimports = b.getImports().get( @@ -124,7 +123,7 @@ // public void testPrivateImport() throws Exception { // Builder b = new Builder(); - // b.addClasspath(new File("jar/osgi.jar")); + // b.addClasspath(getFile("jar/osgi.jar")); // b // .setProperty("Export-Package", // "org.osgi.service.cm;-import:=private, @@ -152,9 +151,9 @@ // } public void testClassnames() throws Exception { Builder b = new Builder(); - b.addClasspath(new File("jar/osgi.jar")); - b.addClasspath(new File("jar/ds.jar")); - b.addClasspath(new File("jar/ifc112.jar")); + b.addClasspath(getFile("jar/osgi.jar")); + b.addClasspath(getFile("jar/ds.jar")); + b.addClasspath(getFile("jar/ifc112.jar")); b.setProperty("Export-Package", "*"); b.setProperty("C1", "${classes;implementing;org.osgi.service.component.*}"); @@ -211,7 +210,7 @@ public void testImportMicroNotTruncated() throws Exception { Builder b = new Builder(); - b.addClasspath(new File("jar/osgi.jar")); + b.addClasspath(getFile("jar/osgi.jar")); b.setProperty("Import-Package", "org.osgi.service.event;version=${@}"); b.build(); String s = b.getImports().get("org.osgi.service.event").get("version"); @@ -220,7 +219,7 @@ public void testImportMicroTruncated() throws Exception { Builder b = new Builder(); - b.addClasspath(new File("jar/osgi.jar")); + b.addClasspath(getFile("jar/osgi.jar")); b.setProperty("Import-Package", "org.osgi.service.event"); b.build(); String s = b.getImports().get("org.osgi.service.event").get("version"); @@ -232,7 +231,7 @@ */ public void testBndInfo() throws Exception { Builder b = new Builder(); - b.addClasspath(new File("bin")); + b.addClasspath(getFile(".")); b.setProperty("Export-Package", "test"); b.setProperty("a", "aaa"); Jar jar = b.build(); @@ -247,7 +246,7 @@ } public void testMultipleExport2() throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("Import-Package", "*"); @@ -281,7 +280,7 @@ // We use properties so the default BSN is then the project name // because that is the base directory - assertEquals(m.getValue("Bundle-SymbolicName"), "aQute.bnd"); + assertEquals("aQute.bnd", m.getValue("Bundle-SymbolicName")); // The file name for the properties is not bnd.bnd, so the // name of the properties file is the default bsn @@ -306,7 +305,7 @@ } public Manifest setup(Properties p, File f) throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); if (f != null) bmaker.setProperties(f); @@ -326,7 +325,7 @@ } public void testDuplicateExport() throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("Import-Package", "*"); @@ -348,7 +347,7 @@ } public void testNoExport() throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("Import-Package", "*"); @@ -369,7 +368,7 @@ } public void testHardcodedImport() throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("Import-Package", "whatever,*"); @@ -410,7 +409,7 @@ * @throws Exception */ public void testSplitOnExportAndPrivate() throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("Export-Package", "org.objectweb.asm.signature"); @@ -467,7 +466,7 @@ * @throws Exception */ public void testMETAINF() throws Exception { - File cp[] = { new File("src"), new File("jar/asm.jar") }; + File cp[] = { new File("src"), getFile("jar/asm.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("Include-Resource", "META-INF/xyz/asm.jar=jar/asm.jar"); @@ -588,7 +587,7 @@ base.put(Analyzer.CONDITIONAL_PACKAGE, "org.osgi.*"); Builder analyzer = new Builder(); analyzer.setProperties(base); - analyzer.setClasspath(new File[] { new File("jar/osgi.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/osgi.jar") }); analyzer.build(); Jar jar = analyzer.getJar(); assertNotNull(jar.getDirectories().get("org/osgi/framework")); @@ -605,8 +604,8 @@ Properties base = new Properties(); base.put(Analyzer.EXPORT_PACKAGE, "*;-split-package:=error"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar"), - new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar"), + getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); System.out.println("Errors: " + analyzer.getErrors()); @@ -623,8 +622,8 @@ Properties base = new Properties(); base.put(Analyzer.EXPORT_PACKAGE, "*"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar"), - new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar"), + getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); System.out.println("Warnings: " + analyzer.getWarnings()); @@ -641,8 +640,8 @@ Properties base = new Properties(); base.put(Analyzer.EXPORT_PACKAGE, "*;-split-package:=merge-first"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar"), - new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar"), + getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); System.out.println("Errors: " + analyzer.getErrors()); @@ -659,8 +658,8 @@ Properties base = new Properties(); base.put(Analyzer.EXPORT_PACKAGE, "*;-split-package:=merge-last"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar"), - new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar"), + getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); System.out.println("Errors: " + analyzer.getErrors()); @@ -680,7 +679,7 @@ base.put(Analyzer.EXPORT_PACKAGE, "*;test:=true"); base.put(Analyzer.INCLUDE_RESOURCE, "does_not_exist"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); System.out.println("Errors: " + analyzer.getErrors()); @@ -736,7 +735,7 @@ base.put(Analyzer.EXPORT_PACKAGE, "*"); base.put(Analyzer.BUNDLE_VERSION, "0.9.0-incubator-SNAPSHOT"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); Manifest manifest = analyzer.getJar().getManifest(); @@ -753,7 +752,7 @@ * @throws Exception */ public void testConditional() throws Exception { - File cp[] = { new File("jar/osgi.jar"), new File("jar/ds.jar") }; + File cp[] = { getFile("jar/osgi.jar"), getFile("jar/ds.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", "*"); @@ -784,7 +783,7 @@ Properties base = new Properties(); base.put(Analyzer.EXPORT_PACKAGE, "*"); Builder analyzer = new Builder(); - analyzer.setClasspath(new File[] { new File("jar/asm.jar") }); + analyzer.setClasspath(new File[] { getFile("jar/asm.jar") }); analyzer.setProperties(base); analyzer.build(); assertFalse(analyzer.getExports().containsKey("META-INF")); @@ -816,7 +815,7 @@ } void assertVersionEquals(String input, String output) throws Exception { - File cp[] = { new File("jar/osgi.jar") }; + File cp[] = { getFile("jar/osgi.jar") }; Builder bmaker = new Builder(); bmaker.setClasspath(cp); Properties p = new Properties(); @@ -831,7 +830,7 @@ } public void testImportExportBadVersion() throws Exception { - File cp[] = { new File("jar/asm.jar") }; + File cp[] = { getFile("jar/asm.jar") }; Builder bmaker = new Builder(); bmaker.setClasspath(cp); Properties p = new Properties(); @@ -943,7 +942,7 @@ public void testClasspathFileNotExist() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - File cp[] = new File[] { new File("jar/idonotexist.jar") }; + File cp[] = new File[] { getFile("jar/idonotexist.jar") }; bmaker.setProperties(p); bmaker.setClasspath(cp); @@ -954,7 +953,7 @@ public void testExpandWithNegate() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - File cp[] = new File[] { new File("jar/asm.jar") }; + File cp[] = new File[] { getFile("jar/asm.jar") }; p.put("Export-Package", "!org.objectweb.asm,*"); bmaker.setProperties(p); @@ -970,7 +969,7 @@ public void testIncludeResourceResourcesOnlyJar() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - File cp[] = new File[] { new File("jar/ro.jar") }; + File cp[] = new File[] { getFile("jar/ro.jar") }; p.put("Export-Package", "*"); p.put("Import-Package", ""); @@ -1064,7 +1063,7 @@ } public void testEasymock() throws Exception { - File cp[] = { new File("jar/easymock.jar") }; + File cp[] = { getFile("jar/easymock.jar") }; Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", "*"); @@ -1078,7 +1077,7 @@ } public void testSources() throws Exception { - File cp[] = { new File("src"), new File("jar/asm.jar") }; + File cp[] = { new File("src"), getFile("jar/asm.jar") }; Builder bmaker = new Builder(); bmaker.setClasspath(cp); bmaker.setSourcepath(new File[] { new File("src") }); @@ -1095,7 +1094,7 @@ } public void testSimple() throws Exception { - File cp[] = { new File("src"), new File("jar/asm.jar") }; + File cp[] = { new File("src"), getFile("jar/asm.jar") }; Builder bmaker = new Builder(); bmaker.setProperties(new File("src/test/simple.mf")); bmaker.setClasspath(cp); Modified: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/ClassParserTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/ClassParserTest.java 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/java/test/ClassParserTest.java 2009-09-29 21:19:02 UTC (rev 94122) @@ -24,7 +24,7 @@ } -public class ClassParserTest extends TestCase { +public class ClassParserTest extends BndTestCase { public void testWildcards() throws Exception { Clazz c = new Clazz("genericstest", null); @@ -40,7 +40,7 @@ public void testWeirdClass() throws Exception { Builder b = new Builder(); b.setProperty("Private-Package", "crap"); - b.addClasspath(new File("test/craptest")); + b.addClasspath(getFile("test/craptest")); Jar j = b.build(); System.out.println(b.getWarnings()); assertEquals(0, b.getErrors().size()); @@ -57,7 +57,7 @@ } public void testGenericsSignature2() throws Exception { - Clazz c = new Clazz("genericstest", new FileResource(new File("src/test/generics.clazz"))); + Clazz c = new Clazz("genericstest", new FileResource(getFile("test/generics.clazz"))); c.parseClassFile(); assertTrue(c.getReferred().containsKey("javax.swing.table")); assertTrue(c.getReferred().containsKey("javax.swing")); @@ -65,7 +65,7 @@ public void testGenericsSignature() throws Exception { - Clazz c = new Clazz("genericstest", new FileResource(new File("src/test/generics.clazz"))); + Clazz c = new Clazz("genericstest", new FileResource(getFile("test/generics.clazz"))); c.parseClassFile(); assertTrue(c.getReferred().containsKey("javax.swing.table")); assertTrue(c.getReferred().containsKey("javax.swing")); @@ -97,7 +97,7 @@ public void testJQuantlib() throws Exception { Builder b = new Builder(); - b.addClasspath(new File("test/jquantlib-0.1.2.jar")); + b.addClasspath(getFile("jar/jquantlib-0.1.2.jar")); b.setProperty("Export-Package", "*"); Jar jar = b.build(); } @@ -145,7 +145,7 @@ public void testLargeClass2() throws IOException { try { URL url = new URL( - "jar:file:jar/ecj_3.2.2.jar!/org/eclipse/jdt/internal/compiler/parser/Parser.class"); + "jar:file:" + getFile("jar/ecj_3.2.2.jar") + "!/org/eclipse/jdt/internal/compiler/parser/Parser.class"); InputStream in = url.openStream(); assertNotNull(in); Clazz clazz = new Clazz("test", null); @@ -161,7 +161,7 @@ */ public void testEcj() throws Exception { Builder builder = new Builder(); - builder.setClasspath(new File[] { new File("jar/ecj_3.2.2.jar") }); + builder.setClasspath(new File[] { getFile("jar/ecj_3.2.2.jar") }); builder.setProperty(Analyzer.EXPORT_PACKAGE, "org.eclipse.*"); builder.build(); System.out.println(builder.getErrors()); Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/asm.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/asm.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ds.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ds.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ecj_3.2.2.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ecj_3.2.2.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ifc112.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/ifc112.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/jquantlib-0.1.2.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/jquantlib-0.1.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.bnd 2009-09-29 21:19:02 UTC (rev 94122) @@ -0,0 +1,2 @@ +-classpath: mina.jar +Export-Package: *;mandatory:="x,y";x=1;y=2 Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.bnd ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/mandatorynoversion.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/osgi.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/jar/osgi.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/JobsService.clazz =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/JobsService.clazz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/Parser.jclass =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/Parser.jclass ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/Test2.jclass =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/Test2.jclass ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/WithAnnotations.jclass =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/WithAnnotations.jclass ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/XDbCmpXView.clazz =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/XDbCmpXView.clazz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/bnd.info =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/bnd.info (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/bnd.info 2009-09-29 21:19:02 UTC (rev 94122) @@ -0,0 +1,6 @@ +# See BuilderTest.testBndInfo +p=${p} +a=${a} +b=${b} +now=${now} +d=fixed Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/craptest/crap/Simple.class =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/craptest/crap/Simple.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/generics.clazz =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/bnd/src/test/resources/test/generics.clazz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jboss-osgi/projects/aQute/trunk/libg/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/libg/pom.xml 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/libg/pom.xml 2009-09-29 21:19:02 UTC (rev 94122) @@ -18,13 +18,13 @@ <name>aQute - Libg</name> <groupId>biz.aQute</groupId> - <artifactId>libg</artifactId> + <artifactId>aQute.libg</artifactId> <packaging>jar</packaging> <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>parent</artifactId> + <artifactId>aQute.parent</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> Modified: projects/jboss-osgi/projects/aQute/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/pom.xml 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/pom.xml 2009-09-29 21:19:02 UTC (rev 94122) @@ -18,7 +18,7 @@ <description>A utility and plugin to wrap, build, or print bundles</description> <groupId>biz.aQute</groupId> - <artifactId>parent</artifactId> + <artifactId>aQute.parent</artifactId> <packaging>pom</packaging> <version>0.0.366-SNAPSHOT</version> Modified: projects/jboss-osgi/projects/aQute/trunk/runtime/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/runtime/pom.xml 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/runtime/pom.xml 2009-09-29 21:19:02 UTC (rev 94122) @@ -18,13 +18,13 @@ <name>aQute - Runtime</name> <groupId>biz.aQute</groupId> - <artifactId>runtime</artifactId> + <artifactId>aQute.runtime</artifactId> <packaging>jar</packaging> <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>parent</artifactId> + <artifactId>aQute.parent</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> Modified: projects/jboss-osgi/projects/aQute/trunk/service/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/service/pom.xml 2009-09-29 20:13:29 UTC (rev 94121) +++ projects/jboss-osgi/projects/aQute/trunk/service/pom.xml 2009-09-29 21:19:02 UTC (rev 94122) @@ -18,13 +18,13 @@ <name>aQute - Service</name> <groupId>biz.aQute</groupId> - <artifactId>service</artifactId> + <artifactId>aQute.service</artifactId> <packaging>jar</packaging> <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>parent</artifactId> + <artifactId>aQute.parent</artifactId> <version>0.0.366-SNAPSHOT</version> </parent>