[jboss-cvs] JBossAS SVN: r96951 - in projects/jboss-osgi/trunk: testsuite/functional and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 25 09:28:08 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-11-25 09:28:07 -0500 (Wed, 25 Nov 2009)
New Revision: 96951
Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
Log:
Document functional test failures on embedded equinox
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/pom.xml 2009-11-25 14:28:07 UTC (rev 96951)
@@ -66,7 +66,7 @@
<version.jboss.osgi.runtime.equinox>3.5.1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webapp>0.7.2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 14:28:07 UTC (rev 96951)
@@ -146,22 +146,10 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <exclude>org/jboss/test/osgi/capabilities/**</exclude>
- <exclude>org/jboss/test/osgi/jbossas/jbosgi36/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi37/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi38/**</exclude>
+ <!-- [JBOSGI-206] Wire to an already uninstalled bundle -->
<exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi92/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
+ <!-- [JBOSGI-108] Investigate statics on PackageAdmin.refresh -->
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi112/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi151/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi161/**</exclude>
- <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
- <exclude>org/jboss/test/osgi/service/startlevel/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2009-11-25 14:28:07 UTC (rev 96951)
@@ -15,6 +15,7 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.eclipse.equinox:org.eclipse.osgi.services:jar</include>
+ <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -68,14 +68,21 @@
runtime.addCapability(new XMLParserCapability());
- OSGiServiceReference saxRef = runtime.getServiceReference(SAXParserFactory.class.getName());
- assertNotNull("SAXParserFactory registered", saxRef);
+ String filter = "(" + XMLParserCapability.PARSER_PROVIDER + "=" + XMLParserCapability.PROVIDER_JBOSS_OSGI + ")";
+ OSGiServiceReference[] saxRefs = runtime.getServiceReferences(SAXParserFactory.class.getName(), filter);
+ assertNotNull("SAXParserFactory registered", saxRefs);
+ assertEquals("SAXParserFactory registered", 1, saxRefs.length);
+
+ OSGiServiceReference saxRef = saxRefs[0];
assertEquals("namespaceAware", Boolean.TRUE, saxRef.getProperty("parser.namespaceAware"));
assertEquals("validating", Boolean.TRUE, saxRef.getProperty("parser.validating"));
assertEquals("xincludeAware", Boolean.TRUE, saxRef.getProperty("parser.xincludeAware"));
- OSGiServiceReference domRef = runtime.getServiceReference(DocumentBuilderFactory.class.getName());
- assertNotNull("DocumentBuilderFactory registered", domRef);
+ OSGiServiceReference[] domRefs = runtime.getServiceReferences(DocumentBuilderFactory.class.getName(), filter);
+ assertNotNull("DocumentBuilderFactory registered", domRefs);
+ assertEquals("DocumentBuilderFactory registered", 1, domRefs.length);
+
+ OSGiServiceReference domRef = domRefs[0];
assertEquals("namespaceAware", Boolean.TRUE, domRef.getProperty("parser.namespaceAware"));
assertEquals("validating", Boolean.TRUE, domRef.getProperty("parser.validating"));
assertEquals("xincludeAware", Boolean.TRUE, domRef.getProperty("parser.xincludeAware"));
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -61,12 +61,12 @@
try
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleX = sysContext.installBundle(getTestArchivePath("jbosgi143-bundleX.jar"));
+ Bundle bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi143-bundleX.jar").toExternalForm());
bundleX.start();
assertBundleLoadClass(bundleX, BeanX.class, true);
- Bundle bundleA = sysContext.installBundle(getTestArchivePath("jbosgi143-bundleA.jar"));
+ Bundle bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi143-bundleA.jar").toExternalForm());
bundleA.start();
assertBundleLoadClass(bundleA, BeanA.class, true);
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -89,10 +89,10 @@
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleA = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleA.jar"));
+ Bundle bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleA.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleA.getState());
- Bundle bundleB = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleB.jar"));
+ Bundle bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleB.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleB.getState());
bundleB.start();
@@ -116,10 +116,10 @@
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleC = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleC.jar"));
+ Bundle bundleC = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleC.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleC.getState());
- Bundle bundleD = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleD.jar"));
+ Bundle bundleD = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleD.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleD.getState());
bundleD.start();
@@ -143,10 +143,10 @@
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleD = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleD.jar"));
+ Bundle bundleD = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleD.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleD.getState());
- Bundle bundleC = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleC.jar"));
+ Bundle bundleC = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleC.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleC.getState());
bundleD.start();
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -79,8 +79,16 @@
{
String storageRoot = bundleA.getProperty("org.osgi.framework.storage");
assertNotNull("Storage dir not null", storageRoot);
-
- File dataFile = new File(storageRoot + "/bundle" + bundleA.getBundleId() + "/data/" + filename);
+
+ File dataFile;
+ if ("equinox".equals(getFramework()))
+ {
+ dataFile = new File(storageRoot + "/org.eclipse.osgi/bundles/" + bundleA.getBundleId() + "/data/" + filename);
+ }
+ else
+ {
+ dataFile = new File(storageRoot + "/bundle" + bundleA.getBundleId() + "/data/" + filename);
+ }
return dataFile;
}
}
\ No newline at end of file
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties 2009-11-25 14:28:07 UTC (rev 96951)
@@ -0,0 +1,9 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# Equinox debug properties
+org.eclipse.osgi/debug=true
+org.eclipse.osgi/debug/loader=false
Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 14:28:07 UTC (rev 96951)
@@ -4,16 +4,15 @@
# $Id$
#
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration
+# Equinox properties
+# osgi.debug=target/test-classes/equinox-debug.properties
# Properties to configure the Framework
org.osgi.framework.storage=${basedir}/target/osgi-store
org.osgi.framework.storage.clean=onFirstInit
# Extra System Packages
-org.osgi.framework.system.packages=\
- javax.management, \
+org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
@@ -26,7 +25,6 @@
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.osgi.testing, \
org.jboss.virtual, \
org.jboss.virtual.plugins.registry, \
org.jboss.virtual.plugins.context.jar, \
@@ -36,5 +34,5 @@
org.jboss.util.id, \
org.jboss.util.threadpool, \
org.jboss.util.propertyeditor, \
- org.osgi.framework;version\=1.4
+ org.osgi.framework;version=1.4
More information about the jboss-cvs-commits
mailing list