You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by eg...@apache.org on 2009/03/10 13:39:19 UTC
svn commit: r752093 - in /cxf/dosgi/trunk/systests:
common/src/main/java/org/apache/cxf/dosgi/systests/common/
multi_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/multibundle/
single_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests...
Author: eglynn
Date: Tue Mar 10 12:39:18 2009
New Revision: 752093
URL: http://svn.apache.org/viewvc?rev=752093&view=rev
Log:
Fix for singlebundle.ListenerHookServiceListenerTest failure caused by inadvertant multiple loading of the DSW bundle.
Modified:
cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractListenerHookServiceListenerTest.java
cxf/dosgi/trunk/systests/multi_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/multibundle/ListenerHookServiceListenerTest.java
cxf/dosgi/trunk/systests/single_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/singlebundle/ListenerHookServiceListenerTest.java
Modified: cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractListenerHookServiceListenerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractListenerHookServiceListenerTest.java?rev=752093&r1=752092&r2=752093&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractListenerHookServiceListenerTest.java (original)
+++ cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractListenerHookServiceListenerTest.java Tue Mar 10 12:39:18 2009
@@ -92,8 +92,10 @@
// sleep for a bit
Thread.sleep(2000);
- // now install dsw
- installBundle("org.apache.cxf.dosgi", "cxf-dosgi-ri-dsw-cxf", null, "jar");
+ if (!usingIntegralDsw()) {
+ // now install dsw
+ installBundle("org.apache.cxf.dosgi", "cxf-dosgi-ri-dsw-cxf", null, "jar");
+ }
verifyGreeterResponse();
} finally {
if (tracker != null) {
@@ -107,6 +109,8 @@
}
}
+
+ protected abstract boolean usingIntegralDsw();
private Map<GreetingPhrase, String> useService(ServiceReference sref) {
GreeterService hs = (GreeterService)bundleContext.getService(sref);
Modified: cxf/dosgi/trunk/systests/multi_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/multibundle/ListenerHookServiceListenerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/multi_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/multibundle/ListenerHookServiceListenerTest.java?rev=752093&r1=752092&r2=752093&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/multi_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/multibundle/ListenerHookServiceListenerTest.java (original)
+++ cxf/dosgi/trunk/systests/multi_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/multibundle/ListenerHookServiceListenerTest.java Tue Mar 10 12:39:18 2009
@@ -26,4 +26,8 @@
protected File [] getDistributionBundles() throws Exception {
return MultiBundleDistributionResolver.getDistribution();
}
+
+ protected boolean usingIntegralDsw() {
+ return false;
+ }
}
Modified: cxf/dosgi/trunk/systests/single_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/singlebundle/ListenerHookServiceListenerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/single_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/singlebundle/ListenerHookServiceListenerTest.java?rev=752093&r1=752092&r2=752093&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/single_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/singlebundle/ListenerHookServiceListenerTest.java (original)
+++ cxf/dosgi/trunk/systests/single_bundle_distro/src/test/java/org/apache/cxf/dosgi/systests/singlebundle/ListenerHookServiceListenerTest.java Tue Mar 10 12:39:18 2009
@@ -26,4 +26,8 @@
protected File [] getDistributionBundles() throws Exception {
return SingleBundleDistributionResolver.getDistribution();
}
+
+ protected boolean usingIntegralDsw() {
+ return true;
+ }
}