You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2015/12/15 22:58:38 UTC
incubator-geode git commit: Fix tests broken by JDK 8 and Membership
listener changes.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-217 afed66577 -> e1a72f72a
Fix tests broken by JDK 8 and Membership listener changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e1a72f72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e1a72f72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e1a72f72
Branch: refs/heads/feature/GEODE-217
Commit: e1a72f72aea88c73e88fea36fff5e0e900c1d851
Parents: afed665
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Dec 15 13:57:50 2015 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Dec 15 13:57:50 2015 -0800
----------------------------------------------------------------------
.../distributed/DistributedMemberDUnitTest.java | 4 ++--
.../LocalDistributionManagerDUnitTest.java | 19 +++++++++++--------
.../examples/CatchExceptionExampleDUnitTest.java | 4 ++--
3 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e1a72f72/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 94abc83..31ef697 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -23,7 +23,7 @@ import static com.googlecode.catchexception.CatchException.caughtException;
import static com.jayway.awaitility.Awaitility.with;
import static com.jayway.awaitility.Duration.TWO_HUNDRED_MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.StrictAssertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
@@ -178,7 +178,7 @@ public class DistributedMemberDUnitTest implements Serializable {
catchException(Host.getHost(0).getVM(2)).invoke(getSystemWithName("name0"));
// assert
- assertThat(caughtException())
+ assertThat((Exception)caughtException())
.isInstanceOf(RMIException.class);
assertThat(caughtException().getCause())
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e1a72f72/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
index 0fe28bd..1e681f7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
@@ -10,7 +10,7 @@ package com.gemstone.gemfire.distributed.internal;
import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
import static com.gemstone.gemfire.test.dunit.Threads.*;
import static com.gemstone.gemfire.test.dunit.Wait.*;
-import static org.assertj.core.api.StrictAssertions.*;
+import static org.assertj.core.api.Assertions.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -409,14 +409,24 @@ public class LocalDistributionManagerDUnitTest implements Serializable {
/** Has a member departed recently? */
private boolean departed = false;
+ @Override
public void memberJoined(InternalDistributedMember id) {
this.joined = true;
}
+ @Override
public void memberDeparted(InternalDistributedMember id, boolean crashed) {
this.departed = true;
}
+ @Override
+ public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected, String reason) {
+ }
+
+ @Override
+ public void quorumLost(Set<InternalDistributedMember> failures, List<InternalDistributedMember> remaining) {
+ }
+
/**
* Gets (and then forgets) whether or not a member has recently
* joined the distributed system.
@@ -427,13 +437,6 @@ public class LocalDistributionManagerDUnitTest implements Serializable {
return b;
}
- public void quorumLost(Set<InternalDistributedMember> failures, List<InternalDistributedMember> remaining) {
- }
-
- public void memberSuspect(InternalDistributedMember id,
- InternalDistributedMember whoSuspected) {
- }
-
/**
* Gets (and then forgets) whether or not a member has recently
* departed the distributed system.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e1a72f72/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
index 4693c01..fa92f03 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
@@ -1,7 +1,7 @@
package com.gemstone.gemfire.test.examples;
import static com.googlecode.catchexception.CatchException.*;
-import static org.assertj.core.api.StrictAssertions.*;
+import static org.assertj.core.api.Assertions.*;
import java.io.Serializable;
@@ -36,7 +36,7 @@ public class CatchExceptionExampleDUnitTest implements Serializable {
catchException(vm).invoke(new ThrowBasicTestException());
- assertThat(caughtException())
+ assertThat((Exception)caughtException())
.isInstanceOf(RMIException.class)
.hasCause(new BasicTestException(REMOTE_THROW_EXCEPTION_MESSAGE));
}