Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-10-19 10:03:42 +0000
committerEike Stepper2010-10-19 10:03:42 +0000
commitcd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d (patch)
tree2bb5a24b79ce3dffe38c85874418580fb8cf764c /plugins/org.eclipse.net4j.tests
parent229a1603ee62c04266c90e50909a04e464fb5bf8 (diff)
downloadcdo-cd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d.tar.gz
cdo-cd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d.tar.xz
cdo-cd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d.zip
[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflows
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327405
Diffstat (limited to 'plugins/org.eclipse.net4j.tests')
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java6
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java3
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java8
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java6
4 files changed, 7 insertions, 16 deletions
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
index 4c8181101f..f1da15dc92 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
@@ -190,8 +190,7 @@ public class TCPConnectorTest extends AbstractOMTest
connector.activate();
// Can fail due to timing variations: assertEquals(false, connector.isActive());
- boolean connected = connector.waitForConnection(DEFAULT_TIMEOUT);
- assertEquals(true, connected);
+ connector.waitForConnection(DEFAULT_TIMEOUT);
assertEquals(true, connector.isActive());
}
@@ -263,8 +262,7 @@ public class TCPConnectorTest extends AbstractOMTest
connector.setPort(2036);
connector.activate();
- boolean connected = connector.waitForConnection(DEFAULT_TIMEOUT);
- assertEquals(true, connected);
+ connector.waitForConnection(DEFAULT_TIMEOUT);
InternalChannel clientChannel = connector.openChannel();
assertEquals(USER_ID, clientChannel.getUserID());
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
index 0cc1a68a78..e813c99c5f 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
@@ -62,9 +62,8 @@ public class JVMAcceptorDefImplTest extends AbstractOMTest
assertTrue(LifecycleUtil.isActive(jvmAcceptor));
LifecycleUtil.activate(jvmConnector);
- boolean connected = jvmConnector.waitForConnection(DELAY + TIMEOUT);
+ jvmConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(connected);
assertTrue(LifecycleUtil.isActive(jvmConnector));
LifecycleUtil.deactivate(jvmAcceptor);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
index a7ae4cb2b8..6354f36619 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
@@ -62,9 +62,7 @@ public class TCPAcceptorDefImplTest extends AbstractOMTest
assertTrue(LifecycleUtil.isActive(tcpAcceptor));
LifecycleUtil.activate(tcpConnector);
- boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
-
- assertTrue(connected);
+ tcpConnector.waitForConnection(DELAY + TIMEOUT);
assertTrue(LifecycleUtil.isActive(tcpConnector));
LifecycleUtil.deactivate(tcpAcceptor);
@@ -95,9 +93,7 @@ public class TCPAcceptorDefImplTest extends AbstractOMTest
Util.addNegotiator(USERID, PASSWORD, tcpConnector);
LifecycleUtil.activate(tcpConnector);
- boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(connected);
-
+ tcpConnector.waitForConnection(DELAY + TIMEOUT);
LifecycleUtil.deactivate(tcpConnector);
Util.removeNegotiator(tcpConnector);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
index 043316a3e0..37178d9333 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
@@ -62,8 +62,7 @@ public class TCPConnectorDefImplTest extends AbstractProtocolTest
ITCPConnector tcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
- boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(connected);
+ tcpConnector.waitForConnection(DELAY + TIMEOUT);
assertTrue(LifecycleUtil.isActive(tcpConnector));
LifecycleUtil.deactivate(tcpConnector);
@@ -117,8 +116,7 @@ public class TCPConnectorDefImplTest extends AbstractProtocolTest
ITCPConnector tcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
- boolean connected = tcpConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(connected);
+ tcpConnector.waitForConnection(DELAY + TIMEOUT);
assertTrue(LifecycleUtil.isActive(tcpConnector));
LifecycleUtil.deactivate(tcpConnector);

Back to the top