Repository: geode Updated Branches: refs/heads/develop 8b8084f02 -> ab075c457
spotless fixes Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ab075c45 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ab075c45 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ab075c45 Branch: refs/heads/develop Commit: ab075c457b23bccd2389b0fdecb1a6d3145bac1e Parents: 8b8084f Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Wed Jan 4 07:50:23 2017 -0800 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Wed Jan 4 07:50:23 2017 -0800 ---------------------------------------------------------------------- .../GemFireDeadlockDetectorDUnitTest.java | 8 +++--- .../geode/test/dunit/DUnitBlackboard.java | 8 +++--- .../internal/DUnitBlackboardDUnitTest.java | 27 ++++++++++---------- .../internal/JUnit4DistributedTestCase.java | 3 +-- 4 files changed, 21 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/ab075c45/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java index 9c0f8f0..9b68b23 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java @@ -168,16 +168,14 @@ public class GemFireDeadlockDetectorDUnitTest extends JUnit4CacheTestCase { AsyncInvocation async2 = lockTheDLocks(vm1, "two", "one"); Awaitility.await("waiting for locks to be acquired").atMost(60, TimeUnit.SECONDS) - .until(Awaitility.matches(() -> - assertTrue(getBlackboard().isGateSignaled("one")))); + .until(Awaitility.matches(() -> assertTrue(getBlackboard().isGateSignaled("one")))); Awaitility.await("waiting for locks to be acquired").atMost(60, TimeUnit.SECONDS) - .until(Awaitility.matches(() -> - assertTrue(getBlackboard().isGateSignaled("two")))); + .until(Awaitility.matches(() -> assertTrue(getBlackboard().isGateSignaled("two")))); GemFireDeadlockDetector detect = new GemFireDeadlockDetector(); LinkedList<Dependency> deadlock = detect.find().findCycle(); - + assertTrue(deadlock != null); System.out.println("Deadlock=" + DeadlockDetector.prettyFormat(deadlock)); http://git-wip-us.apache.org/repos/asf/geode/blob/ab075c45/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java index 4bbb19e..a097cd4 100755 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java @@ -36,11 +36,11 @@ import org.apache.geode.test.dunit.internal.InternalBlackboardImpl; */ public class DUnitBlackboard { InternalBlackboard blackboard; - + public DUnitBlackboard() { blackboard = InternalBlackboardImpl.getInstance(); } - + /** * resets the blackboard */ @@ -73,7 +73,7 @@ public class DUnitBlackboard { } catch (RemoteException e) { throw new RuntimeException("remote call failed", e); } - + } /** @@ -86,7 +86,7 @@ public class DUnitBlackboard { throw new RuntimeException("remote call failed", e); } } - + /** * put an object into a mailbox slot. The object must be java-serializable */ http://git-wip-us.apache.org/repos/asf/geode/blob/ab075c45/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java index a6fa042..c8d71da 100755 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java @@ -36,21 +36,22 @@ public class DUnitBlackboardDUnitTest extends JUnit4DistributedTestCase { final String MBOX = "myMailbox"; VM vm0 = Host.getHost(0).getVM(0); VM vm1 = Host.getHost(0).getVM(1); - - vm0.invoke("put data in mailbox", () -> - getBlackboard().setMailbox(MBOX, "testing")); - - String result = (String)vm1.invoke("get data from mailbox", () -> { - return getBlackboard().getMailbox(MBOX); }); - + + vm0.invoke("put data in mailbox", () -> getBlackboard().setMailbox(MBOX, "testing")); + + String result = (String) vm1.invoke("get data from mailbox", () -> { + return getBlackboard().getMailbox(MBOX); + }); + assertEquals("testing", result); } + @Test public void canSignalAnotherVM() throws Exception { final String GATE = "myGate"; VM vm0 = Host.getHost(0).getVM(0); VM vm1 = Host.getHost(0).getVM(1); - + vm1.invoke("wait on gate not yet signalled", () -> { assertFalse(getBlackboard().isGateSignaled(GATE)); try { @@ -63,9 +64,8 @@ public class DUnitBlackboardDUnitTest extends JUnit4DistributedTestCase { } fail("unexpected success"); }); - - vm0.invoke("signal gate", () -> - getBlackboard().signalGate(GATE)); + + vm0.invoke("signal gate", () -> getBlackboard().signalGate(GATE)); vm1.invoke("wait on gate not yet signalled", () -> { try { @@ -78,7 +78,7 @@ public class DUnitBlackboardDUnitTest extends JUnit4DistributedTestCase { // success expected }); } - + @Test public void initBlackboardClearsEverything() throws Exception { for (int i = 0; i < 100; i++) { @@ -87,8 +87,7 @@ public class DUnitBlackboardDUnitTest extends JUnit4DistributedTestCase { getBlackboard().signalGate("GATE" + i); assertTrue(getBlackboard().isGateSignaled("GATE" + i)); } - Host.getHost(0).getVM(1).invoke("clear blackboard", () -> - getBlackboard().initBlackboard()); + Host.getHost(0).getVM(1).invoke("clear blackboard", () -> getBlackboard().initBlackboard()); for (int i = 0; i < 100; i++) { assertNull(getBlackboard().getMailbox("MBOX" + i)); http://git-wip-us.apache.org/repos/asf/geode/blob/ab075c45/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java index 344a0e1..c54b6ac 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java @@ -118,8 +118,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur private static DUnitBlackboard blackboard; /** - * Returns a DUnitBlackboard that can be used to pass data between VMs and - * synchronize actions. + * Returns a DUnitBlackboard that can be used to pass data between VMs and synchronize actions. * * @return the blackboard */
