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 2016/06/21 11:52:37 UTC
aries-rsa git commit: [ARIES-1576] Fix tests
Repository: aries-rsa
Updated Branches:
refs/heads/master a8d170a85 -> 7909d39cf
[ARIES-1576] Fix tests
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/7909d39c
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/7909d39c
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/7909d39c
Branch: refs/heads/master
Commit: 7909d39cf073e2fb8df14566ac8dd7b63ab4afda
Parents: a8d170a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jun 21 13:52:20 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Jun 21 13:52:20 2016 +0200
----------------------------------------------------------------------
.../aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java | 2 --
.../org/apache/aries/rsa/provider/tcp/TcpProviderTest.java | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7909d39c/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
index 6efd9fd..a86d303 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
@@ -26,8 +26,6 @@ import javax.inject.Inject;
import org.apache.aries.rsa.examples.echotcp.api.EchoService;
import org.apache.aries.rsa.itests.felix.RsaTestBase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7909d39c/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 91b8e4c..ad36f65 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,6 +18,8 @@
*/
package org.apache.aries.rsa.provider.tcp;
+import static org.hamcrest.core.StringStartsWith.startsWith;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -50,11 +52,12 @@ public class TcpProviderTest {
TCPProvider provider = new TCPProvider();
Map<String, Object> props = new HashMap<String, Object>();
EndpointHelper.addObjectClass(props, exportedInterfaces);
- props.put("hostname", "localhost");
- props.put("numThreads", "10");
+ props.put("aries.rsa.hostname", "localhost");
+ props.put("aries.rsa.numThreads", "10");
MyService myService = new MyServiceImpl();
BundleContext bc = EasyMock.mock(BundleContext.class);
ep = provider.exportService(myService, bc, props, exportedInterfaces);
+ Assert.assertThat(ep.description().getId(), startsWith("tcp://localhost:"));
System.out.println(ep.description());
myServiceProxy = (MyService)provider.importEndpoint(MyService.class.getClassLoader(),
bc,