Author: davidb
Date: Fri Jan 29 15:23:23 2010
New Revision: 904518
URL: http://svn.apache.org/viewvc?rev=904518&view=rev
Log:
Enabling Discovery System Tests.
Modified:
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
Modified:
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
(original)
+++
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
Fri Jan 29 15:23:23 2010
@@ -118,7 +118,7 @@
private ServiceReference waitService(String cls, String filter) throws
Exception {
ServiceReference[] refs = null;
- for (int i=0; i < 20; i++) {
+ for (int i=0; i < 60; i++) {
refs = getBundleContext().getServiceReferences(cls, filter);
if (refs != null && refs.length > 0) {
return refs[0];
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
Fri Jan 29 15:23:23 2010
@@ -77,7 +77,6 @@
@Test
public void testDiscoveryRoundtrip() throws Exception {
- // Enabled soon
- // baseTestDiscoveryRoundtrip();
+ baseTestDiscoveryRoundtrip();
}
}
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
Fri Jan 29 15:23:23 2010
@@ -44,6 +44,10 @@
int startLevel = MultiBundleTools.getDistroBundles(bundles, false);
List<Option> opts = new ArrayList<Option>();
+
+ // Run this test under Felix.
+ opts.add(CoreOptions.frameworks(CoreOptions.felix()));
+
opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value(""
+ startLevel));
opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
Modified:
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
(original)
+++
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
Fri Jan 29 15:23:23 2010
@@ -44,6 +44,10 @@
int startLevel = MultiBundleTools.getDistroBundles(bundles, false);
List<Option> opts = new ArrayList<Option>();
+
+ // Run this test under Felix.
+ opts.add(CoreOptions.frameworks(CoreOptions.felix()));
+
opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value(""
+ startLevel));
opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
Fri Jan 29 15:23:23 2010
@@ -42,6 +42,9 @@
// // setting timeout to 0 means wait as long as the remote
service comes available.
// waitForFrameworkStartup(),
+ // Run this one in Felix
+ CoreOptions.frameworks(CoreOptions.felix()),
+
CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
@@ -63,7 +66,6 @@
@Test
public void testDiscoveryRoundtrip() throws Exception {
- // Enabled soon
- // baseTestDiscoveryRoundtrip();
+ baseTestDiscoveryRoundtrip();
}
}
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java
Fri Jan 29 15:23:23 2010
@@ -36,6 +36,9 @@
// // this is necessary to let junit runner not timout the
remote process before attaching debugger
// // setting timeout to 0 means wait as long as the remote
service comes available.
// waitForFrameworkStartup(),
+
+ // Run this one in Felix
+ CoreOptions.frameworks(CoreOptions.felix()),
CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java?rev=904518&r1=904517&r2=904518&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java
Fri Jan 29 15:23:23 2010
@@ -36,6 +36,9 @@
@Configuration
public static Option[] configure() {
return CoreOptions.options(
+ // Run this one in Equinox
+ CoreOptions.frameworks(CoreOptions.equinox()),
+
CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
