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 2018/02/08 16:41:08 UTC
[8/9] aries-rsa git commit: [ARIES-1769] Fixing wrong intent names
and exception in timeout case
[ARIES-1769] Fixing wrong intent names and exception in timeout case
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/9a08b235
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/9a08b235
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/9a08b235
Branch: refs/heads/master
Commit: 9a08b23533b4b085b10129d8e06d07b677a6c8d9
Parents: 362b68d
Author: Christian Schneider <cs...@adobe.com>
Authored: Thu Feb 8 17:31:10 2018 +0100
Committer: Christian Schneider <cs...@adobe.com>
Committed: Thu Feb 8 17:40:34 2018 +0100
----------------------------------------------------------------------
.../org/apache/aries/rsa/provider/tcp/TCPProvider.java | 2 +-
.../org/apache/aries/rsa/provider/tcp/TcpEndpoint.java | 2 +-
.../aries/rsa/provider/tcp/TcpProviderIntentTest.java | 12 ++++++++++++
.../apache/aries/rsa/provider/tcp/TcpProviderTest.java | 8 ++++++--
4 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/9a08b235/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java
----------------------------------------------------------------------
diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java
index bceb063..6d3b6ad 100644
--- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java
+++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("rawtypes")
public class TCPProvider implements DistributionProvider {
static final String TCP_CONFIG_TYPE = "aries.tcp";
- private static final String[] SUPPORTED_INTENTS = { "osgi.basic", "osgi.sync"};
+ private static final String[] SUPPORTED_INTENTS = { "osgi.basic", "osgi.async"};
private Logger logger = LoggerFactory.getLogger(TCPProvider.class);
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/9a08b235/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java
----------------------------------------------------------------------
diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java
index fc207c3..00d06f2 100644
--- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java
+++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java
@@ -45,7 +45,7 @@ public class TcpEndpoint implements Endpoint {
String endpointId = String.format("tcp://%s:%s",hostName, tcpServer.getPort());
effectiveProperties.put(RemoteConstants.ENDPOINT_ID, endpointId);
effectiveProperties.put(RemoteConstants.SERVICE_EXPORTED_CONFIGS, "");
- effectiveProperties.put(RemoteConstants.SERVICE_INTENTS, Arrays.asList("osgi.basic, osgi.async"));
+ effectiveProperties.put(RemoteConstants.SERVICE_INTENTS, Arrays.asList("osgi.basic", "osgi.async"));
// tck tests for one such property ... so we provide it
effectiveProperties.put(TCPProvider.TCP_CONFIG_TYPE + ".id", endpointId);
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/9a08b235/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java
----------------------------------------------------------------------
diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java
index c339ca6..1d7928c 100644
--- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java
+++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java
@@ -18,8 +18,10 @@
*/
package org.apache.aries.rsa.provider.tcp;
+import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -49,6 +51,16 @@ public class TcpProviderIntentTest {
}
@Test
+ public void basicAndAsnycIntents() {
+ Map<String, Object> props = new HashMap<String, Object>();
+ EndpointHelper.addObjectClass(props, exportedInterfaces);
+ String[] standardIntents = new String[] {"osgi.basic", "osgi.async"};
+ props.put(RemoteConstants.SERVICE_EXPORTED_INTENTS, standardIntents);
+ Endpoint ep = provider.exportService(myService, bc, props, exportedInterfaces);
+ Assert.assertThat("Service should be exported as the intents: " + Arrays.toString(standardIntents) + " must be supported", ep, notNullValue());
+ }
+
+ @Test
public void unknownIntent() {
Map<String, Object> props = new HashMap<String, Object>();
EndpointHelper.addObjectClass(props, exportedInterfaces);
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/9a08b235/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
----------------------------------------------------------------------
diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
index 538b52b..67678f3 100644
--- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
+++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
@@ -18,8 +18,10 @@
*/
package org.apache.aries.rsa.provider.tcp;
+import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -47,6 +49,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceException;
import org.osgi.util.promise.Promise;
public class TcpProviderTest {
@@ -81,8 +84,9 @@ public class TcpProviderTest {
try {
myServiceProxy.callSlow(TIMEOUT + 100);
Assert.fail("Expecting timeout");
- } catch (RuntimeException e) {
- Assert.assertEquals(SocketTimeoutException.class, e.getCause().getClass());
+ } catch (ServiceException e) {
+ assertThat(e.getCause().getClass().getName(), equalTo(SocketTimeoutException.class.getName()));
+ assertThat(e.getType(), equalTo(ServiceException.REMOTE));
}
}