You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/02/13 17:44:25 UTC
[geode] branch feature/GEODE-6369 updated: fix unit test and remove
unused method in GMSUtil
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6369
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6369 by this push:
new f6ec4ac fix unit test and remove unused method in GMSUtil
f6ec4ac is described below
commit f6ec4ac506374e416e2512971a5cc2fcc110a30f
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Wed Feb 13 09:43:38 2019 -0800
fix unit test and remove unused method in GMSUtil
---
.../internal/membership/MembershipJUnitTest.java | 15 ---------------
.../gms/membership/GMSJoinLeaveJUnitTest.java | 1 +
.../internal/membership/gms/GMSUtil.java | 21 ---------------------
3 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
index 0c259f3..69184ff 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.SerialAckedMessage;
-import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.interfaces.JoinLeave;
@@ -450,20 +449,6 @@ public class MembershipJUnitTest {
}
}
- /**
- * test the GMSUtil.formatBytes() method
- */
- @Test
- public void testFormatBytes() throws Exception {
- byte[] bytes = new byte[200];
- for (int i = 0; i < bytes.length; i++) {
- bytes[i] = (byte) (i % 255);
- }
- String str = GMSUtil.formatBytes(bytes, 0, bytes.length);
- System.out.println(str);
- assertEquals(600 + 4, str.length());
- }
-
@Test
public void testMessagesThrowExceptionIfProcessed() throws Exception {
ClusterDistributionManager dm = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 1aebc41..38a5473 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -165,6 +165,7 @@ public class GMSJoinLeaveJUnitTest {
gmsJoinLeave.init(services);
gmsJoinLeave.start();
gmsJoinLeave.started();
+ gmsJoinLeave.setLocalAddress(gmsJoinLeaveMemberId);
}
@After
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
index d7366f5..0e14918 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
@@ -128,25 +128,4 @@ public class GMSUtil {
return sb.toString();
}
-
- /**
- * Formats the bytes in a buffer into hex octets, 50 per line
- */
- public static String formatBytes(byte[] buf, int startIndex, int length) {
- StringBuilder w = new StringBuilder(20000);
- int count = 0;
- for (int i = startIndex; i < length; i++, count++) {
- String s = Integer.toHexString(buf[i] & 0xff);
- if (s.length() == 1) {
- w.append('0');
- }
- w.append(s).append(' ');
- if ((count % 50) == 49) {
- w.append("\n");
- }
- }
- return w.toString();
- }
-
-
}