You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/05/02 13:13:32 UTC
[2/2] aries-rsa git commit: Filter out foreign events in
TestRSAListener
Filter out foreign events in TestRSAListener
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/56159ea5
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/56159ea5
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/56159ea5
Branch: refs/heads/master
Commit: 56159ea5835f2e785d60a8ff1f31e26637fcf456
Parents: 8172c77
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue May 2 15:13:26 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue May 2 15:13:26 2017 +0200
----------------------------------------------------------------------
.../aries/rsa/itests/felix/RsaTestBase.java | 12 ++++++++
.../rsa/itests/felix/rsa/TestRSAListener.java | 31 +++++---------------
2 files changed, 19 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/56159ea5/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index 811ae61..b6ba815 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -81,6 +81,18 @@ public class RsaTestBase {
}
}
+ protected Bundle getBundle(String symName) {
+ Bundle serviceBundle = null;
+ Bundle[] bundles = bundleContext.getBundles();
+ for (Bundle bundle : bundles) {
+ if(symName.equals(bundle.getSymbolicName())) {
+ serviceBundle = bundle;
+ break;
+ }
+ }
+ return serviceBundle;
+ }
+
protected static Option echoTcpAPI() {
return mvn("org.apache.aries.rsa.examples.echotcp", "org.apache.aries.rsa.examples.echotcp.api");
}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/56159ea5/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
index 5c9374f..cc287db 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
@@ -23,8 +23,6 @@ import static org.junit.Assert.*;
import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
-
import org.apache.aries.rsa.itests.felix.RsaTestBase;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,19 +30,14 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent;
import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener;
@RunWith(PaxExam.class)
public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminListener {
-
- @Inject
- BundleContext context;
-
private RemoteServiceAdminEvent lastEvent;
-
+ private Bundle serviceBundle;
@Configuration
public static Option[] configure() throws Exception {
@@ -58,9 +51,9 @@ public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminLi
@Test
public void testListener() throws Exception {
- Bundle serviceBundle = getBundle("org.apache.aries.rsa.examples.echotcp.service");
+ serviceBundle = getBundle("org.apache.aries.rsa.examples.echotcp.service");
serviceBundle.stop();
- ServiceRegistration<RemoteServiceAdminListener> sreg = context.registerService(RemoteServiceAdminListener.class, this, null);
+ ServiceRegistration<RemoteServiceAdminListener> sreg = bundleContext.registerService(RemoteServiceAdminListener.class, this, null);
serviceBundle.start();
assertEvent(RemoteServiceAdminEvent.EXPORT_REGISTRATION);
@@ -73,8 +66,10 @@ public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminLi
@Override
public synchronized void remoteAdminEvent(RemoteServiceAdminEvent event) {
- lastEvent = event;
- this.notifyAll();
+ if (serviceBundle == event.getExportReference().getExportedService().getBundle()) {
+ lastEvent = event;
+ this.notifyAll();
+ }
}
private void assertEvent(int eventType) throws InterruptedException, TimeoutException {
@@ -94,16 +89,4 @@ public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminLi
}
}
- private Bundle getBundle(String symName) {
- Bundle serviceBundle = null;
- Bundle[] bundles = context.getBundles();
- for (Bundle bundle : bundles) {
- if(symName.equals(bundle.getSymbolicName())) {
- serviceBundle = bundle;
- break;
- }
- }
- return serviceBundle;
- }
-
}