You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/03/14 18:04:00 UTC
[1/3] incubator-quarks git commit: remove timing sensitivity on
reconnect tests
Repository: incubator-quarks
Updated Branches:
refs/heads/master e1864261f -> c9af34fbb
remove timing sensitivity on reconnect tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/25f1faa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/25f1faa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/25f1faa8
Branch: refs/heads/master
Commit: 25f1faa84caca833d733276b7eda0e9778c88480
Parents: 8dc7ae9
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Mar 11 18:05:15 2016 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Mar 11 18:05:15 2016 -0500
----------------------------------------------------------------------
.../javax/websocket/WebSocketClientTest.java | 26 +++++++++++++-------
1 file changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/25f1faa8/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 79b8daa..6f70cae 100644
--- a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -11,6 +11,7 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -290,20 +291,24 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
// send one, two, restart the server to force reconnect, send the next
- AtomicInteger cnt = new AtomicInteger();
+ AtomicInteger numSent = new AtomicInteger();
+ int restartAfterTupleCnt = 2;
+ CountDownLatch latch = new CountDownLatch(restartAfterTupleCnt);
s = s.filter(tuple -> {
- if (cnt.getAndIncrement() != 2)
+ if (numSent.incrementAndGet() <= restartAfterTupleCnt )
return true;
else {
- // delay so we rcv the prior echo'd tuple
- try { Thread.sleep(2000); } catch (Exception e) {};
+ // to keep validation sane/simple wait till the tuples are rcvd before restarting
+ try { latch.await(); } catch (Exception e) {};
restartEchoer(2/*secDelay*/);
return true;
}
});
wsClient.sendString(s);
- TStream<String> rcvd = wsClient.receiveString();
+ TStream<String> rcvd = wsClient.receiveString()
+ .peek(tuple -> latch.countDown());
+
completeAndValidate("", t, rcvd, SEC_TMO + 10, expected);
}
@@ -325,13 +330,15 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
// send one, two, restart the server to force reconnect, send the next
- AtomicInteger cnt = new AtomicInteger();
+ AtomicInteger numSent = new AtomicInteger();
+ int restartAfterTupleCnt = 2;
+ CountDownLatch latch = new CountDownLatch(restartAfterTupleCnt);
s = s.filter(tuple -> {
- if (cnt.getAndIncrement() != 2)
+ if (numSent.incrementAndGet() <= restartAfterTupleCnt )
return true;
else {
- // delay so we rcv the prior echo'd tuple
- try { Thread.sleep(2000); } catch (Exception e) {};
+ // to keep validation sane/simple wait till the tuples are rcvd before restarting
+ try { latch.await(); } catch (Exception e) {};
restartEchoer(2/*secDelay*/);
return true;
}
@@ -339,6 +346,7 @@ public class WebSocketClientTest extends ConnectorTestBase {
wsClient.sendBytes(s);
TStream<String> rcvd = wsClient.receiveBytes()
+ .peek(tuple -> latch.countDown())
.map(tup -> new String(tup));
completeAndValidate("", t, rcvd, SEC_TMO + 10, expected);
[2/3] incubator-quarks git commit: fix comparison
Posted by dl...@apache.org.
fix comparison
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/3ea9f2ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/3ea9f2ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/3ea9f2ff
Branch: refs/heads/master
Commit: 3ea9f2ffd600dbe2bb2d7c747eaa41d2d7b39867
Parents: 25f1faa
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Mar 11 21:53:44 2016 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Mar 11 21:53:44 2016 -0500
----------------------------------------------------------------------
.../connectors/wsclient/javax/websocket/WebSocketClientTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3ea9f2ff/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 6f70cae..6da1014 100644
--- a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -295,7 +295,7 @@ public class WebSocketClientTest extends ConnectorTestBase {
int restartAfterTupleCnt = 2;
CountDownLatch latch = new CountDownLatch(restartAfterTupleCnt);
s = s.filter(tuple -> {
- if (numSent.incrementAndGet() <= restartAfterTupleCnt )
+ if (numSent.getAndIncrement() != restartAfterTupleCnt )
return true;
else {
// to keep validation sane/simple wait till the tuples are rcvd before restarting
@@ -334,7 +334,7 @@ public class WebSocketClientTest extends ConnectorTestBase {
int restartAfterTupleCnt = 2;
CountDownLatch latch = new CountDownLatch(restartAfterTupleCnt);
s = s.filter(tuple -> {
- if (numSent.incrementAndGet() <= restartAfterTupleCnt )
+ if (numSent.getAndIncrement() != restartAfterTupleCnt )
return true;
else {
// to keep validation sane/simple wait till the tuples are rcvd before restarting
[3/3] incubator-quarks git commit: Merge branch 'pr-4'
Posted by dl...@apache.org.
Merge branch 'pr-4'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/c9af34fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/c9af34fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/c9af34fb
Branch: refs/heads/master
Commit: c9af34fbb3c60496acef9d030e59132d6946d98b
Parents: e186426 3ea9f2f
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Mar 14 13:02:43 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Mar 14 13:02:43 2016 -0400
----------------------------------------------------------------------
.../javax/websocket/WebSocketClientTest.java | 26 +++++++++++++-------
1 file changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------