geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [08/18] incubator-geode git commit: GEODE-1276: Change UnitTests file system to IntegrationTest category GEODE-1307: Rename HeterogenousLuceneSerializer to HeterogeneousLuceneSerializer GEODE-1279: Tests for old TRAC bugs should be renamed to useful name
Date Fri, 06 May 2016 23:55:07 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java
index 342dcf5..dbb58bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java
@@ -16,10 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.persistence;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,11 +25,13 @@ import java.util.Set;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
 
 import com.gemstone.gemfire.internal.FileUtil;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  * TODO: fails when running integrationTest from gradle command-line on Windows 7
@@ -45,10 +44,10 @@ com.gemstone.gemfire.internal.cache.DiskRegionJUnitTest > testAssertionErrorIfMi
         at com.gemstone.gemfire.internal.cache.DiskRegionJUnitTest.testAssertionErrorIfMissingOplog(DiskRegionJUnitTest.java:2630)
  * 
  * Tests for the BackupInspector.
- * 
  */
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
 public class BackupInspectorJUnitTest {
+
   private static final String UNIX_INCREMENTAL_BACKUP_SCRIPT = "#!/bin/bash -e\ncd `dirname $0`\n\n#Restore a backup of gemfire persistent data to the location it was backed up\n#from.\n#This script will refuse to restore if the original data still exists.\n\n#This script was automatically generated by the gemfire backup utility.\n\n#Test for existing originals. If they exist, do not restore the backup.\ntest -e '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3/BACKUPbar.if' && echo 'Backup not restored. Refusing to overwrite /Users/rholmes/Projects/gemfire/test/cacheserver/disk3/BACKUPbar.if' && exit 1 \ntest -e '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1/BACKUPfoo.if' && echo 'Backup not restored. Refusing to overwrite /Users/rholmes/Projects/gemfire/test/cacheserver/disk1/BACKUPfoo.if' && exit 1 \n\n#Restore data\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3'\ncp -rp 'diskstores/bar/dir0'/* '/Users/rholmes/Projects/gemfire/test/cacheserver/di
 sk3'\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk4'\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1'\ncp -rp 'diskstores/foo/dir0'/* '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1'\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk2'\n\n#Incremental backup.  Restore baseline originals from a previous backup.\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/bar/dir0/BACKUPbar_1.drf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3/BACKUPbar_1.drf'\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/foo/dir1/BACKUPfoo_2.crf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk2/BACKUPfoo_2.crf'\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/foo/dir1/BACKUPfoo_2.drf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk2/BACKUPfoo_2.drf'\ncp -p '/Users
 /rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/bar/dir1/BACKUPbar_2.drf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk4/BACKUPbar_2.drf'\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/foo/dir0/BACKUPfoo_1.crf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1/BACKUPfoo_1.crf'\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/bar/dir1/BACKUPbar_2.crf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk4/BACKUPbar_2.crf'\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/bar/dir0/BACKUPbar_1.crf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3/BACKUPbar_1.crf'\ncp -p '/Users/rholmes/Projects/gemfire/test/backup/2012-05-24-09-42/rholmes_mbp_410_v1_56425/diskstores/foo/dir0/BACKUPfoo_1.drf' '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1/BACKUPfo
 o_1.drf'";
   private static final String UNIX_FULL_BACKUP_SCRIPT = "#!/bin/bash -e\ncd `dirname $0`\n\n#Restore a backup of gemfire persistent data to the location it was backed up\n#from.\n#This script will refuse to restore if the original data still exists.\n\n#This script was automatically generated by the gemfire backup utility.\n\n#Test for existing originals. If they exist, do not restore the backup.\ntest -e '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3/BACKUPbar.if' && echo 'Backup not restored. Refusing to overwrite /Users/rholmes/Projects/gemfire/test/cacheserver/disk3/BACKUPbar.if' && exit 1 \ntest -e '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1/BACKUPfoo.if' && echo 'Backup not restored. Refusing to overwrite /Users/rholmes/Projects/gemfire/test/cacheserver/disk1/BACKUPfoo.if' && exit 1 \n\n#Restore data\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3'\ncp -rp 'diskstores/bar/dir0'/* '/Users/rholmes/Projects/gemfire/test/cacheserver/disk3'\nm
 kdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk4'\ncp -rp 'diskstores/bar/dir1'/* '/Users/rholmes/Projects/gemfire/test/cacheserver/disk4'\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1'\ncp -rp 'diskstores/foo/dir0'/* '/Users/rholmes/Projects/gemfire/test/cacheserver/disk1'\nmkdir -p '/Users/rholmes/Projects/gemfire/test/cacheserver/disk2'\ncp -rp 'diskstores/foo/dir1'/* '/Users/rholmes/Projects/gemfire/test/cacheserver/disk2'";
   
@@ -85,12 +84,15 @@ public class BackupInspectorJUnitTest {
    */
   private File fullBackupDir = null;
 
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
   /**
    * Set up data for all tests.
    */
   @Before
   public void setUp() throws Exception {
-    File tempDir = new File(System.getProperty("java.io.tmpdir"));
+    File tempDir = temporaryFolder.newFolder();
     
     /*
      * Create an incremental backup on the file system.
@@ -132,27 +134,10 @@ public class BackupInspectorJUnitTest {
   }
 
   /**
-   * Delete leftover data for all tests.
-   */
-  @After
-  public void tearDown() throws Exception {
-    
-    if((null != this.incrementalBackupDir) && (this.incrementalBackupDir.exists())) {
-      FileUtil.delete(this.incrementalBackupDir);
-    }
-    
-    if((null != this.fullBackupDir) && (this.fullBackupDir.exists())) {
-      FileUtil.delete(fullBackupDir);
-    }
-  }
-
-  /**
    * Tests that an IOException is thrown for a non-existent restore script.
-   * @throws Exception
    */
   @Test
-  public void testNonExistentScriptFile() 
-  throws Exception {
+  public void testNonExistentScriptFile() throws Exception {
     boolean ioexceptionThrown = false;
     
     try {
@@ -169,8 +154,7 @@ public class BackupInspectorJUnitTest {
    * Tests copy lines for windows.
    * @param inspector a BackupInspector.
    */
-  private void testIncrementalBackupScriptForWindows(BackupInspector inspector) 
-  throws Exception {
+  private void testIncrementalBackupScriptForWindows(BackupInspector inspector) throws Exception {
     assertEquals(WINDOWS_COPY_FROM_1,inspector.getCopyFromForOplogFile(OPLOG_FILENAME_1));
     assertEquals(WINDOWS_COPY_TO_1,inspector.getCopyToForOplogFile(OPLOG_FILENAME_1));    
     assertEquals(WINDOWS_COPY_FROM_2,inspector.getCopyFromForOplogFile(OPLOG_FILENAME_2));
@@ -182,10 +166,8 @@ public class BackupInspectorJUnitTest {
   /**
    * Tests copy lines for unix.
    * @param inspector a BackupInspector. 
-   * @throws Exception
    */
-  private void testIncrementalBackupScriptForUnix(BackupInspector inspector) 
-  throws Exception {    
+  private void testIncrementalBackupScriptForUnix(BackupInspector inspector) throws Exception {
     assertEquals(UNIX_COPY_FROM_1,inspector.getCopyFromForOplogFile(OPLOG_FILENAME_1));
     assertEquals(UNIX_COPY_TO_1,inspector.getCopyToForOplogFile(OPLOG_FILENAME_1));    
     assertEquals(UNIX_COPY_FROM_2,inspector.getCopyFromForOplogFile(OPLOG_FILENAME_2));
@@ -196,11 +178,9 @@ public class BackupInspectorJUnitTest {
   
   /**
    * Tests that the parser succeeds for an incremental backup restore script.
-   * @throws Exception
    */
   @Test
-  public void testIncrementalBackupScript() 
-  throws Exception {
+  public void testIncrementalBackupScript() throws Exception {
     BackupInspector inspector = BackupInspector.createInspector(incrementalBackupDir);
     
     assertTrue(inspector.isIncremental());
@@ -222,11 +202,9 @@ public class BackupInspectorJUnitTest {
   
   /**
    * Tests that the parser works with a full backup restore script.
-   * @throws Exception
    */
   @Test
-  public void testFullBackupScript() 
-  throws Exception {
+  public void testFullBackupScript() throws Exception {
     BackupInspector inspector = BackupInspector.createInspector(fullBackupDir);
     assertFalse(inspector.isIncremental());
     assertTrue(inspector.getIncrementalOplogFileNames().isEmpty());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
index 3940a82..adfbad4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
@@ -16,32 +16,29 @@
  */
 package com.gemstone.gemfire.internal.cache.persistence.query;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import junit.framework.TestCase;
-
 import com.gemstone.gemfire.internal.cache.CachedDeserializable;
-import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
-import com.gemstone.gemfire.internal.cache.persistence.query.IndexMap;
 import com.gemstone.gemfire.internal.cache.persistence.query.IndexMap.IndexEntry;
 import com.gemstone.gemfire.internal.cache.persistence.query.mock.IndexMapImpl;
 import com.gemstone.gemfire.internal.cache.persistence.query.mock.NaturalComparator;
 import com.gemstone.gemfire.internal.cache.persistence.query.mock.Pair;
 import com.gemstone.gemfire.internal.cache.persistence.query.mock.PairComparator;
-import com.gemstone.gemfire.internal.cache.persistence.query.ResultBag;
-import com.gemstone.gemfire.internal.cache.persistence.query.ResultSet;
-import com.gemstone.gemfire.internal.cache.persistence.query.TemporaryResultSetFactory;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
-public class TemporaryResultSetFactoryJUnitTest extends TestCase {
+public class TemporaryResultSetFactoryJUnitTest {
 
+  @Test
   public void testSortedResultSet() {
     ResultSet set = new TemporaryResultSetFactory().getSortedResultSet(null, false);
     set.add(1);
@@ -51,9 +48,9 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     set.add(2);
     
     assertItrEquals(set.iterator(), 1,2, 3, 4);
-    
   }
-  
+
+  @Test
   public void testSortedResultBag() {
     ResultBag set = new TemporaryResultSetFactory().getSortedResultBag(null, false);
     set.add(1);
@@ -61,11 +58,11 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     set.add(4);
     set.add(3);
     set.add(2);
-    
-    
+
     assertItrEquals(set.iterator(), 1,2, 2,3, 4);
   }
-  
+
+  @Test
   public void testResultList() {
     ResultList set = new TemporaryResultSetFactory().getResultList();
     set.add(1);
@@ -73,12 +70,12 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     set.add(4);
     set.add(3);
     set.add(2);
-    
-    
+
     assertItrEquals(set.iterator(), 1,2, 4,3, 2);
     assertItrEquals(set.iterator(2), 4,3, 2);
   }
-  
+
+  @Test
   public void testIndexMap() {
     IndexMap map = new IndexMapImpl();
     TreeMap expected = new TreeMap(new PairComparator(new NaturalComparator(), new NaturalComparator()));
@@ -87,7 +84,6 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     put("i4", "r4", "v4", map, expected);
     put("i2", "r5", "v5", map, expected);
     
-    
     assertItrEquals(map.keyIterator(), "r1", "r2", "r5", "r4");
     assertItrEquals(map.keyIterator("i2", true, "i3", true), "r2", "r5");
     assertItrEquals(map.keyIterator("i2", true, "i2", true), "r2", "r5");
@@ -97,16 +93,12 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     assertEntryEquals(map.iterator("i2", true, "i4", true), expected.tailMap(new Pair("i1", "r2")));
   }
 
-  private void put(String ikey, String rkey, String value, IndexMap map,
-      Map expected) {
+  private void put(String ikey, String rkey, String value, IndexMap map, Map expected) {
     map.put(ikey, rkey, value);
     expected.put(new Pair(ikey, rkey), value);
-    
   }
 
-  private void assertItrEquals(
-      CloseableIterator<CachedDeserializable> iterator, Object ... values) {
-    
+  private void assertItrEquals(CloseableIterator<CachedDeserializable> iterator, Object ... values) {
     ArrayList actual = new ArrayList();
     
     while(iterator.hasNext()) {
@@ -114,12 +106,9 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     }
     
     assertEquals(Arrays.asList(values), actual);
-    
   }
   
-  private void assertEntryEquals(
-      CloseableIterator<IndexEntry> closeableIterator, Map expected) {
-    
+  private void assertEntryEquals(CloseableIterator<IndexEntry> closeableIterator, Map expected) {
     LinkedHashMap actual = new LinkedHashMap();
     
     while(closeableIterator.hasNext()) {
@@ -131,6 +120,5 @@ public class TemporaryResultSetFactoryJUnitTest extends TestCase {
     }
     
     assertEquals(expected, actual);
-    
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
index 09fde8a..fcbd140 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
@@ -16,7 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache.region.entry;
 
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import static org.junit.Assert.*;
+
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 import org.junit.Before;
@@ -24,7 +25,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertEquals;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 @RunWith(JUnitParamsRunner.class)
@@ -77,9 +78,7 @@ public class RegionEntryFactoryBuilderJUnitTest {
       "VersionedStatsDiskLRURegionEntryHeapFactory,true,true,true,true,false",
       "VersionedStatsDiskLRURegionEntryOffHeapFactory,true,true,true,true,true"
   })
-  public void testRegionEntryFactoryUnitTest(String factoryName, boolean enableStats, boolean enableLRU, boolean enableDisk,
-      boolean enableVersioning, boolean enableOffHeap) {
-    assertEquals(factoryName,
-        regionEntryFactoryBuilder.getRegionEntryFactoryOrNull(enableStats, enableLRU, enableDisk, enableVersioning, enableOffHeap).getClass().getSimpleName());
+  public void testRegionEntryFactoryUnitTest(String factoryName, boolean enableStats, boolean enableLRU, boolean enableDisk,boolean enableVersioning, boolean enableOffHeap) {
+    assertEquals(factoryName, regionEntryFactoryBuilder.getRegionEntryFactoryOrNull(enableStats, enableLRU, enableDisk, enableVersioning, enableOffHeap).getClass().getSimpleName());
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
index 40d741e..3b0157f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -112,7 +112,7 @@ public class Bug37805DUnitTest extends DistributedTestCase{
       }
     }
     //assertNull(rootRegions);
-    //assertEquals(0,((Collection)CacheServerTestUtil.getCache().rootRegions()).size());
+    //assertIndexDetailsEquals(0,((Collection)CacheServerTestUtil.getCache().rootRegions()).size());
   }
   
   private Pool getClientPool(String host, int server1Port,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index 52f416a..f03f5fa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -478,12 +478,12 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     if (server.equals("server1")) {
       r1.invalidate(k1);
       assertNull(r1.getEntry(k1).getValue());
-      //assertEquals(r1.getEntry(k2).getValue(), server1_k2);
+      //assertIndexDetailsEquals(r1.getEntry(k2).getValue(), server1_k2);
     }
     else if (server.equals("server2")) {
       r1.invalidate(k1);
       assertNull(r1.getEntry(k1).getValue());
-      //assertEquals(r1.getEntry(k2).getValue(), server2_k3);
+      //assertIndexDetailsEquals(r1.getEntry(k2).getValue(), server2_k3);
     }
   }
 
@@ -495,12 +495,12 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     if (server.equals("server1")) {
       r1.destroy(k1);
       assertNull(r1.getEntry(k1));
-      //assertEquals(r1.getEntry(k2).getValue(), server1_k2);
+      //assertIndexDetailsEquals(r1.getEntry(k2).getValue(), server1_k2);
     }
     else if (server.equals("server2")) {
       r1.destroy(k1);
       assertNull(r1.getEntry(k1));
-      //assertEquals(r1.getEntry(k2).getValue(), server2_k3);
+      //assertIndexDetailsEquals(r1.getEntry(k2).getValue(), server2_k3);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index 42ff29a..5953b8a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -222,8 +222,8 @@ public class ClientHealthMonitorJUnitTest
 //     }
 //     connection1.putObject("region1", "key-1", "value-2", new EventID(new byte[] {1},1,3), null);
 //     this.system.getLogWriter().info("did put 2");
-//     assertEquals(1, s.getInt("currentClients"));
-//     assertEquals(1, s.getInt("currentClientConnections"));
+//     assertIndexDetailsEquals(1, s.getInt("currentClients"));
+//     assertIndexDetailsEquals(1, s.getInt("currentClientConnections"));
 
 //     // now lets see what happens when we close our connection
 //     // note we use a nasty close which just closes the socket instead
@@ -238,8 +238,8 @@ public class ClientHealthMonitorJUnitTest
 //                                       + s.getInt("currentClients")
 //                                       + " currentClientConnections="
 //                                       + s.getInt("currentClientConnections"));
-//       assertEquals(0, s.getInt("currentClients"));
-//       assertEquals(0, s.getInt("currentClientConnections"));
+//       assertIndexDetailsEquals(0, s.getInt("currentClients"));
+//       assertIndexDetailsEquals(0, s.getInt("currentClientConnections"));
 //     }
   }
  public void addExceptions() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 5415e86..d5111bc 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -623,7 +623,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     };
     Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
-    // assertEquals(region1.getEntry(k1).getValue(), k1);
+    // assertIndexDetailsEquals(region1.getEntry(k1).getValue(), k1);
     wc = new WaitCriterion() {
       String excuse;
       public boolean done() {
@@ -648,8 +648,8 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     };
     Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
-    // assertEquals(region1.getEntry(k2).getValue(), k2);
-    // assertEquals(region2.getEntry(k1).getValue(), k1);
+    // assertIndexDetailsEquals(region1.getEntry(k2).getValue(), k2);
+    // assertIndexDetailsEquals(region2.getEntry(k1).getValue(), k1);
     wc = new WaitCriterion() {
       String excuse;
       public boolean done() {
@@ -662,7 +662,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     };
     Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
-    // assertEquals(region2.getEntry(k2).getValue(), k2);
+    // assertIndexDetailsEquals(region2.getEntry(k2).getValue(), k2);
   }
 
   /**
@@ -1103,7 +1103,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       assertNull(cache.getRegion(Region.SEPARATOR + regionName));
        verifyCacheClientProxyOnServer();
 
-      //assertEquals(1, bs.getAcceptor().getCacheClientNotifier().getClientProxies().size());
+      //assertIndexDetailsEquals(1, bs.getAcceptor().getCacheClientNotifier().getClientProxies().size());
     }
     catch (Exception ex) {
       ex.printStackTrace();
@@ -1215,7 +1215,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       };
       Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
-      // assertEquals(k1, r1.getEntry(k1).getValue());
+      // assertIndexDetailsEquals(k1, r1.getEntry(k1).getValue());
       wc = new WaitCriterion() {
         String excuse;
         public boolean done() {
@@ -1228,7 +1228,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       };
       Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
-      // assertEquals(k2, r1.getEntry(k2).getValue());
+      // assertIndexDetailsEquals(k2, r1.getEntry(k2).getValue());
       wc = new WaitCriterion() {
         String excuse;
         public boolean done() {
@@ -1241,7 +1241,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       };
       Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
-      // assertEquals(server_k1, r2.getEntry(k1).getValue());
+      // assertIndexDetailsEquals(server_k1, r2.getEntry(k1).getValue());
       wc = new WaitCriterion() {
         String excuse;
         public boolean done() {
@@ -1254,7 +1254,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       };
       Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
-      // assertEquals(server_k2, r2.getEntry(k2).getValue());
+      // assertIndexDetailsEquals(server_k2, r2.getEntry(k2).getValue());
     }
     catch (Exception ex) {
       Assert.fail("failed while verifyUpdates()", ex);
@@ -1358,7 +1358,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       };
       Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
-      // assertEquals(server_k1, r2.getEntry(k1).getValue());
+      // assertIndexDetailsEquals(server_k1, r2.getEntry(k1).getValue());
       wc = new WaitCriterion() {
         String excuse;
         public boolean done() {
@@ -1371,7 +1371,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
       };
       Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
-      // assertEquals(server_k2, r2.getEntry(k2).getValue());
+      // assertIndexDetailsEquals(server_k2, r2.getEntry(k2).getValue());
     }
     catch (Exception ex) {
       Assert.fail("failed while verifyUpdatesOnRegion2()", ex);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index 2aed3a7..d62addf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -553,7 +553,7 @@ public class ConflationDUnitTest extends DistributedTestCase
       }
     };
     Wait.waitForCriterion(ev, 60 * 1000, 200, true);
-    // assertEquals("creates", 2, counterCreate);
+    // assertIndexDetailsEquals("creates", 2, counterCreate);
     
     ev = new WaitCriterion() {
       public boolean done() {
@@ -566,7 +566,7 @@ public class ConflationDUnitTest extends DistributedTestCase
     };
     Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     
-    // assertEquals("destroys", 2, counterDestroy);
+    // assertIndexDetailsEquals("destroys", 2, counterDestroy);
     // assertTrue("updates", 20000 >= counterUpdate);
     ev = new WaitCriterion() {
       public boolean done() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index 90bb911..bd4f94a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -537,7 +537,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
     // Verify that it is durable and its properties are correct
     assertTrue(proxy.isDurable());
     assertEquals("DurableClientReconnectDUnitTest_client", proxy.getDurableId());
-//    assertEquals(60, proxy.getDurableTimeout());
+//    assertIndexDetailsEquals(60, proxy.getDurableTimeout());
     }catch (Exception e){
       Assert.fail("test failed due to" , e);
     }    

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FilterProfileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FilterProfileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FilterProfileJUnitTest.java
index 1314d42..5d53dd2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FilterProfileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FilterProfileJUnitTest.java
@@ -16,10 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.util.Collections;
 
@@ -36,8 +34,8 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 @Category(UnitTest.class)
 public class FilterProfileJUnitTest {
 
-  LocalRegion mockRegion;
-  FilterProfile fprofile;
+  private LocalRegion mockRegion;
+  private FilterProfile fprofile;
   
   @Before
   public void setUp() {
@@ -48,7 +46,6 @@ public class FilterProfileJUnitTest {
     fprofile = new FilterProfile(mockRegion);
   }
 
-  
   @Test
   public void testUnregisterKey() {
     unregisterKey(false);
@@ -102,8 +99,7 @@ public class FilterProfileJUnitTest {
     assertTrue(isClientInterested);
     fprofile.unregisterClientInterest(clientId, "Object1234", InterestType.KEY);
     fprofile.unregisterClientInterest(clientId, "Object4567", InterestType.KEY);
-    assertFalse("still has this interest: " + fprofile.getKeysOfInterestFor(clientId),
-        fprofile.hasKeysOfInterestFor(clientId, inv));
+    assertFalse("still has this interest: " + fprofile.getKeysOfInterestFor(clientId), fprofile.hasKeysOfInterestFor(clientId, inv));
   }
 
   @Test
@@ -134,7 +130,6 @@ public class FilterProfileJUnitTest {
     assertFalse(fprofile.hasKeysOfInterestFor(clientId, inv));
   }
 
-  
   @Test
   public void testUnregisterRegex() {
     unregisterRegex(false);
@@ -194,7 +189,6 @@ public class FilterProfileJUnitTest {
     assertFalse(fprofile.hasRegexInterestFor(clientId, inv));
   }
 
-
   @Test
   public void testUnregisterAllKeys() {
     unregisterAllKeys(false);
@@ -237,7 +231,7 @@ public class FilterProfileJUnitTest {
     unregisterFilterClass(inv, true);
   }
 
-  public void unregisterFilterClass(boolean inv, boolean twoClients) {
+  private void unregisterFilterClass(boolean inv, boolean twoClients) {
     String clientId = "client";
     fprofile.registerClientInterest(clientId, "com.gemstone.gemfire.internal.cache.tier.sockets.TestFilter", InterestType.FILTER_CLASS, inv);
     if (twoClients) {
@@ -264,7 +258,7 @@ public class FilterProfileJUnitTest {
     unregisterAllFilterClass(inv, true);
   }
 
-  public void unregisterAllFilterClass(boolean inv, boolean twoClients) {
+  private void unregisterAllFilterClass(boolean inv, boolean twoClients) {
     String clientId = "client";
     fprofile.registerClientInterest(clientId, "com.gemstone.gemfire.internal.cache.tier.sockets.TestFilter", InterestType.FILTER_CLASS, inv);
     if (twoClients) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 693ead4..13f2527 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -382,7 +382,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
   }
 
 //  public static void processException() {
-//    assertEquals(conn.getServer().getPort(), PORT1.intValue());
+//    assertIndexDetailsEquals(conn.getServer().getPort(), PORT1.intValue());
 //    try {
 //      pool.processException(new Exception("dummy"), conn);
 //      //Thread.sleep(10000); // why sleep?
@@ -516,7 +516,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase {
     {
     try {
       Cache c = CacheFactory.getAnyInstance();
-      // assertEquals("More than one BridgeServer", 1,
+      // assertIndexDetailsEquals("More than one BridgeServer", 1,
       // c.getCacheServers().size());
       WaitCriterion wc = new WaitCriterion() {
         String excuse;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index 74370c7..66527d0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -269,7 +269,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
       final String key1 = "key-1";
       assertNotNull(r);
       // Verify that 'key-1' was updated
-      // assertEquals("vm2-key-1", r.getEntry("key-1").getValue());
+      // assertIndexDetailsEquals("vm2-key-1", r.getEntry("key-1").getValue());
       WaitCriterion wc = new WaitCriterion() {
         String excuse;
         public boolean done() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
index 8caf3f6..9f05aa7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -17,7 +17,6 @@
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.net.Socket;
@@ -33,11 +32,11 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 @Category(UnitTest.class)
 public class MessageJUnitTest {
 
-  Message message;
-  Socket mockSocket;
-  MessageStats mockStats;
-  ByteBuffer msgBuffer;
-  ServerConnection mockServerConnection;
+  private Message message;
+  private Socket mockSocket;
+  private MessageStats mockStats;
+  private ByteBuffer msgBuffer;
+  private ServerConnection mockServerConnection;
   
   @Before
   public void setUp() throws Exception {
@@ -81,11 +80,10 @@ public class MessageJUnitTest {
     message.setParts(parts);
     try {
       message.send();
+      fail("expected an exception but none was thrown");
     } catch (MessageTooLargeException e) {
       assertTrue(e.getMessage().contains("exceeds maximum integer value"));
-      return;
     }
-    fail("expected an exception but none was thrown");
   }
   
   @Test
@@ -98,14 +96,12 @@ public class MessageJUnitTest {
     message.setParts(parts);
     try {
       message.send();
+      fail("expected an exception but none was thrown");
     } catch (MessageTooLargeException e) {
       assertFalse(e.getMessage().contains("exceeds maximum integer value"));
-      return;
     }
-    fail("expected an exception but none was thrown");
   }
-  
-  
+
   // TODO many more tests are needed
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index ef6bfcb..0805e2a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -16,24 +16,23 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
+import static org.junit.Assert.*;
+
 import java.io.IOException;
 import java.util.List;
 
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import junit.framework.TestCase;
-
 import com.gemstone.gemfire.CopyHelper;
 import com.gemstone.gemfire.internal.util.BlobHelper;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-/**
- *
- */
 @Category(UnitTest.class)
-public class ObjectPartListJUnitTest extends TestCase {
-  
-  public void testValueAsObject() throws IOException {
+public class ObjectPartListJUnitTest {
+
+  @Test
+  public void testValueAsObject() throws Exception {
     VersionedObjectList list = new VersionedObjectList(100, false, false);
     byte[] normalBytes = "value1".getBytes();
     list.addObjectPart("key", normalBytes , false, null);
@@ -69,8 +68,9 @@ public class ObjectPartListJUnitTest extends TestCase {
     assertEquals(new TestException("hello"), values.get(3));
     assertNull(values.get(4));
   }
-  
-  public void testValueAsObjectByteArray() throws IOException, ClassNotFoundException {
+
+  @Test
+  public void testValueAsObjectByteArray() throws Exception {
     ObjectPartList list = new VersionedObjectList(100, false, false, true);
     byte[] normalBytes = "value1".getBytes();
     list.addObjectPart("key", normalBytes , false, null);
@@ -108,10 +108,8 @@ public class ObjectPartListJUnitTest extends TestCase {
 
     public TestException(String message) {
       super(message);
-      // TODO Auto-generated constructor stub
     }
-    
-    
+
     @Override
     public boolean equals(Object o) {
       if(!(o instanceof TestException)) {
@@ -122,8 +120,5 @@ public class ObjectPartListJUnitTest extends TestCase {
       }
       return true;
     }
-    
-    
   }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index 65d6448..f1fba88 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -65,8 +65,8 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       //pause(5000);      
       verifyLiveAndRedundantServers(3, 0);
       verifyOrderOfEndpoints();
-      //assertEquals(1, pool.getRedundantNames().size());
-      // assertEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
 //      pause(10 * 1000);
 //      assertFalse(pool.getCurrentServerNames().contains(SERVER3));
       WaitCriterion wc = new WaitCriterion() {
@@ -114,8 +114,8 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       // pause(5000);
       verifyLiveAndRedundantServers(3, 0);
       verifyOrderOfEndpoints();
-      //assertEquals(1, pool.getRedundantNames().size());
-      //assertEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
 //      pause(10 * 1000);
 //      assertFalse(pool.getCurrentServerNames().contains(SERVER1));
       WaitCriterion wc = new WaitCriterion() {
@@ -153,7 +153,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       assertEquals(1, pool.getRedundantNames().size());
       //assertTrue(pool.getRedundantNames().contains(SERVER1));      
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
       //pause(5000);
@@ -162,11 +162,11 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
       // assertTrue(proxy.getDeadServers().contains(SERVER3));
-      //assertEquals(2, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
-      //assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -193,7 +193,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER4));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -202,11 +202,11 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
       // assertTrue(proxy.getDeadServers().contains(SERVER3));
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -230,7 +230,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER4));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -241,11 +241,11 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
       // assertTrue(proxy.getDeadServers().contains(SERVER3));
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -270,7 +270,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER4));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -280,11 +280,11 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
       // assertTrue(proxy.getDeadServers().contains(SERVER3));
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -308,7 +308,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -318,11 +318,11 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
       // assertTrue(proxy.getDeadServers().contains(SERVER3));
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
-      // assertEquals(3, pool.getConnectedServerCount());
-     // assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+     // assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -347,20 +347,20 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       assertEquals(1, pool.getRedundantNames().size());
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
       //pause(5000);
       verifyDeadServers(1);
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
-      //assertEquals(2, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       //      assertTrue(pool.getRedundantNames()
       //          .contains(SERVER1));
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration());
-      //assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -387,20 +387,20 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       assertEquals(1, pool.getRedundantNames().size());
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
       verifyDeadServers(1);
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration());
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -425,7 +425,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       assertEquals(1, pool.getRedundantNames().size());
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -434,13 +434,13 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyDeadServers(1);
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration());
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -465,7 +465,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       assertEquals(1, pool.getRedundantNames().size());
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -473,14 +473,14 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyDeadServers(1);
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       verifyOrderOfEndpoints();
       //server1.invoke(RedundancyLevelTestBase.class,
       //    "verifyInterestRegistration");
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -505,7 +505,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       assertEquals(1, pool.getRedundantNames().size());
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -517,13 +517,13 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
       verifyDeadServers(1);
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER1));
       verifyOrderOfEndpoints();
       server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration());
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index 4692699..0499847 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
@@ -67,7 +67,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
 
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server0.invoke(() -> RedundancyLevelTestBase.stopServer());
       //pause(5000);
@@ -75,12 +75,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
-      //assertEquals(2, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       //assertTrue(pool.getRedundantNames()
       //    .contains(SERVER2));
       assertTrue(pool.getPrimaryName().equals(SERVER2));
-      //assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -108,7 +108,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       waitConnectedServers(4);
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server0.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -116,12 +116,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER2));
       assertTrue(pool.getPrimaryName().equals(SERVER2));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -147,7 +147,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       waitConnectedServers(4);
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server0.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -157,12 +157,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER2));
       assertTrue(pool.getPrimaryName().equals(SERVER2));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -188,7 +188,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       waitConnectedServers(4);
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server0.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -197,12 +197,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER2));
       assertTrue(pool.getPrimaryName().equals(SERVER2));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -228,7 +228,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       waitConnectedServers(4);
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
-      //assertEquals(0, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(0, proxy.getDeadServers().size());
       verifyOrderOfEndpoints();
       server0.invoke(() -> RedundancyLevelTestBase.stopServer());
       // pause(5000);
@@ -237,12 +237,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       verifyRedundantServersContain(SERVER3);
       verifyLiveAndRedundantServers(3, 1);
       verifyOrderOfEndpoints();
-      // assertEquals(2, pool.getRedundantNames().size());
+      // assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // assertTrue(pool.getRedundantNames()
       // .contains(SERVER2));
       assertTrue(pool.getPrimaryName().equals(SERVER2));
-      // assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(1, proxy.getDeadServers().size());
+      // assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
     }
     catch (Exception ex) {
       Assert.fail(
@@ -273,7 +273,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(5000);
       verifyLiveAndRedundantServers(2, 1);
       verifyOrderOfEndpoints();
-      //assertEquals(2, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       //Not Sure
       //assertTrue(pool.getPrimaryName().equals(SERVER2));
       server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration());
@@ -311,19 +311,19 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
       verifyDeadServers(2);
-      //assertEquals(2, pool.getConnectedServerCount());
-      //assertEquals(2, proxy.getDeadServers().size());
+      //assertIndexDetailsEquals(2, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(2, proxy.getDeadServers().size());
       //pause(10000);
       verifyLiveAndRedundantServers(2, 1);
       verifyOrderOfEndpoints();
-      //assertEquals(2, pool.getRedundantNames().size());      
+      //assertIndexDetailsEquals(2, pool.getRedundantNames().size());
       // bring up one server.
       server1.invoke(() -> RedundancyLevelTestBase.startServer());
       //pause(10000);
       verifyLiveAndRedundantServers(3, 2);
       verifyOrderOfEndpoints();
-      //assertEquals(3, pool.getRedundantNames().size());
-      //assertEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(3, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       verifyRedundantServersContain(SERVER2);
       verifyRedundantServersContain(SERVER4);
@@ -334,8 +334,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);
       Wait.pause(1000);
       verifyOrderOfEndpoints();
-      //assertEquals(3, pool.getRedundantNames().size());
-      //assertEquals(4, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(3, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(4, pool.getConnectedServerCount());
       server2.invoke(() -> RedundancyLevelTestBase.verifyNoCCP());
     }
     catch (Exception ex) {
@@ -364,8 +364,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);      
       verifyLiveAndRedundantServers(2, 1);
       verifyOrderOfEndpoints();
-      //assertEquals(2, pool.getRedundantNames().size());
-      //assertEquals(2, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(2, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(2, pool.getConnectedServerCount());
       assertTrue(pool.getRedundantNames().contains(SERVER4));
       assertTrue(pool.getPrimaryName().equals(SERVER1));
       assertFalse(pool.getRedundantNames().contains(SERVER3));
@@ -375,8 +375,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);
       verifyLiveAndRedundantServers(3, 2);
       verifyOrderOfEndpoints();
-      //assertEquals(3, pool.getConnectedServerCount());
-      //assertEquals(3, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(3, pool.getRedundantNames().size());
       assertTrue(pool.getRedundantNames().contains(SERVER4));
       assertTrue(pool.getRedundantNames().contains(SERVER3));
       assertTrue(pool.getPrimaryName().equals(SERVER1));
@@ -387,8 +387,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);
       Wait.pause(1000);
       verifyOrderOfEndpoints();
-      //assertEquals(3, pool.getRedundantNames().size());
-      //assertEquals(4, pool.getConnectedServerCount());      
+      //assertIndexDetailsEquals(3, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(4, pool.getConnectedServerCount());
       assertTrue(pool.getRedundantNames().contains(SERVER4));
       assertTrue(pool.getRedundantNames().contains(SERVER3));
       assertTrue(pool.getPrimaryName().equals(SERVER1));
@@ -418,8 +418,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);      
       verifyLiveAndRedundantServers(3, 2);
       verifyOrderOfEndpoints();
-      //assertEquals(3, pool.getRedundantNames().size());
-      //assertEquals(3, pool.getConnectedServerCount());      
+      //assertIndexDetailsEquals(3, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
       assertTrue(pool.getRedundantNames().contains(SERVER3));
       assertTrue(pool.getRedundantNames().contains(SERVER4));
       assertTrue(pool.getPrimaryName().equals(SERVER1));
@@ -428,8 +428,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       server1.invoke(() -> RedundancyLevelTestBase.startServer());
       Wait.pause(1000);
       verifyOrderOfEndpoints();
-      //assertEquals(3, pool.getRedundantNames().size());
-      //assertEquals(4, pool.getConnectedServerCount());      
+      //assertIndexDetailsEquals(3, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(4, pool.getConnectedServerCount());
       assertTrue(pool.getRedundantNames().contains(SERVER3));
       assertTrue(pool.getRedundantNames().contains(SERVER4));
       assertTrue(pool.getPrimaryName().equals(SERVER1));
@@ -458,8 +458,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);
       verifyLiveAndRedundantServers(3, 2);
       verifyOrderOfEndpoints();
-      //assertEquals(1, pool.getRedundantNames().size());
-      //assertEquals(3, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(3, pool.getConnectedServerCount());
       assertFalse(pool.getRedundantNames().contains(SERVER1));
       assertFalse(pool.getRedundantNames().contains(SERVER3));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
@@ -470,8 +470,8 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
       //pause(10000);
       verifyLiveAndRedundantServers(4, 3);
       verifyOrderOfEndpoints();
-      //assertEquals(1, pool.getRedundantNames().size());
-      //assertEquals(4, pool.getConnectedServerCount());
+      //assertIndexDetailsEquals(1, pool.getRedundantNames().size());
+      //assertIndexDetailsEquals(4, pool.getConnectedServerCount());
       //assertTrue(pool.getRedundantNames()
       //    .contains(SERVER1));
       assertTrue(pool.getRedundantNames().contains(SERVER2));
@@ -495,12 +495,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
   {
     try {
       createClientCache(getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1);
-      assertEquals(1, proxy.getRedundantServers().size());
-      assertEquals(PORT3, proxy.acquireConnection().getEndpoint().getPort());
-      assertEquals(PORT4, proxy.acquireConnection().getEndpoint().getPort());
-      assertEquals(PORT1, proxy.acquireConnection().getEndpoint().getPort());
-      assertEquals(PORT2, proxy.acquireConnection().getEndpoint().getPort());
-      assertEquals(PORT3, proxy.acquireConnection().getEndpoint().getPort());
+      assertIndexDetailsEquals(1, proxy.getRedundantServers().size());
+      assertIndexDetailsEquals(PORT3, proxy.acquireConnection().getEndpoint().getPort());
+      assertIndexDetailsEquals(PORT4, proxy.acquireConnection().getEndpoint().getPort());
+      assertIndexDetailsEquals(PORT1, proxy.acquireConnection().getEndpoint().getPort());
+      assertIndexDetailsEquals(PORT2, proxy.acquireConnection().getEndpoint().getPort());
+      assertIndexDetailsEquals(PORT3, proxy.acquireConnection().getEndpoint().getPort());
     }
     catch (Exception ex) {
       ex.printStackTrace();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 17e1e2a..285d200 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -156,7 +156,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
   public static void verifyDispatcherIsAlive()
   {
     try {
-//      assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
+//      assertIndexDetailsEquals("More than one BridgeServer", 1, cache.getCacheServers()
 //          .size());
       WaitCriterion wc = new WaitCriterion() {
         String excuse;
@@ -215,7 +215,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
   public static void verifyDispatcherIsNotAlive()
   {
     try {
-      // assertEquals("More than one BridgeServer", 1,
+      // assertIndexDetailsEquals("More than one BridgeServer", 1,
       // cache.getCacheServers().size());
       WaitCriterion wc = new WaitCriterion() {
         String excuse;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
index 328a796..9159ad7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
@@ -16,10 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
+import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -41,12 +38,9 @@ public class CommitCommandTest {
 	 * No NPE should be thrown from the {@link CommitCommand#writeCommitResponse(com.gemstone.gemfire.internal.cache.TXCommitMessage, Message, ServerConnection)}
 	 * if the response message is null as it is the case when JTA
 	 * transaction is rolled back with TX_SYNCHRONIZATION AFTER_COMPLETION STATUS_ROLLEDBACK 
-	 * @throws IOException 
-	 * 
 	 */
 	@Test
-	public void testWriteNullResponse() throws IOException {
-		
+	public void testWriteNullResponse() throws Exception {
 		Cache cache = mock(Cache.class);
 		Message origMsg = mock(Message.class);
 		ServerConnection servConn = mock(ServerConnection.class);
@@ -55,7 +49,5 @@ public class CommitCommandTest {
 		when(cache.getCancelCriterion()).thenReturn(mock(CancelCriterion.class));
 		
 		CommitCommand.writeCommitResponse(null, origMsg, servConn);
-		
 	}
-	
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RVVExceptionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RVVExceptionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RVVExceptionJUnitTest.java
index 62a12df..4935524 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RVVExceptionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RVVExceptionJUnitTest.java
@@ -16,18 +16,17 @@
  */
 package com.gemstone.gemfire.internal.cache.versions;
 
+import static org.junit.Assert.*;
+
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-import junit.framework.TestCase;
-
 @Category(UnitTest.class)
-public class RVVExceptionJUnitTest extends TestCase {
+public class RVVExceptionJUnitTest {
 
-  public RVVExceptionJUnitTest() {
-  }
-  
+  @Test
   public void testRVVExceptionB() {
     RVVExceptionB ex = new RVVExceptionB(5, 10);
     ex.add(8);
@@ -35,14 +34,13 @@ public class RVVExceptionJUnitTest extends TestCase {
     assertEquals(8, ex.getHighestReceivedVersion());
     ex.add(5);
     assertEquals(8, ex.getHighestReceivedVersion());
-    
   }
 
+  @Test
   public void testRVVExceptionT() {
     RVVExceptionT ex = new RVVExceptionT(5, 10);
     ex.add(8);
     ex.add(6);
     assertEquals(8, ex.getHighestReceivedVersion());
-
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolder2JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolder2JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolder2JUnitTest.java
index af78f79..20be1b7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolder2JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolder2JUnitTest.java
@@ -18,8 +18,6 @@ package com.gemstone.gemfire.internal.cache.versions;
 
 import static org.junit.Assert.*;
 
-import java.util.Iterator;
-
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -43,7 +41,6 @@ public class RegionVersionHolder2JUnitTest {
     assertEquals(0, h.getExceptionCount());
   }
 
-
   @Test
   public void testRecordZeroDoesNothingWithBitSet() {
     recordZeroDoesNothing(true);
@@ -161,7 +158,7 @@ public class RegionVersionHolder2JUnitTest {
     assertTrue(h.isSpecialException(e, h));
     h.recordVersion(2l);
     // BUG: the exception is not removed
-//    assertEquals("unexpected RVV exception : " + h, 0, h.getExceptionCount());
+//    assertIndexDetailsEquals("unexpected RVV exception : " + h, 0, h.getExceptionCount());
   }
   
   private void createSpecialException(RegionVersionHolder h) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderJUnitTest.java
index 731f466..b2a74f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -16,33 +16,47 @@
  */
 package com.gemstone.gemfire.internal.cache.versions;
 
-import java.io.FileReader;
-import java.io.Reader;
+import static org.junit.Assert.*;
+
 import java.net.InetAddress;
 import java.util.BitSet;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import junit.framework.TestCase;
-
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.Assert;
 import com.gemstone.gemfire.internal.cache.versions.RVVException.ReceivedVersionsIterator;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
-public class RegionVersionHolderJUnitTest extends TestCase {
-  
-  protected InternalDistributedMember member;
-  
-  int originalBitSetWidth = RegionVersionHolder.BIT_SET_WIDTH;
+public class RegionVersionHolderJUnitTest {
+
+  private int originalBitSetWidth;
+  private InternalDistributedMember member;
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public final void setUp() throws Exception {
+    originalBitSetWidth = RegionVersionHolder.BIT_SET_WIDTH;
     member = new InternalDistributedMember(InetAddress.getLocalHost(), 12345);
+    postSetUp();
   }
-  
+
+  protected void postSetUp() throws Exception {
+  }
+
+  @After
+  public final void tearDown() throws Exception {
+    RegionVersionHolder.BIT_SET_WIDTH = originalBitSetWidth;
+  }
+
+  protected final InternalDistributedMember member() {
+    return member;
+  }
+
+  @Test
   public void test48066_1() {
     RegionVersionHolder vh1 = new RegionVersionHolder(member);
     for (int i=1; i<=3; i++) {
@@ -74,7 +88,8 @@ public class RegionVersionHolderJUnitTest extends TestCase {
       assertEquals(7, vh3.getVersion());
     }
   }
-   
+
+  @Test
   public void test48066() {
     RegionVersionHolder vh = new RegionVersionHolder(member);
     BitSet bs = new BitSet();
@@ -1472,6 +1487,7 @@ public class RegionVersionHolderJUnitTest extends TestCase {
   /**
    * Test merging two version holders
    */
+  @Test
   public void testInitializeFrom() {
     testInitializeFrom(false);
     testInitializeFrom(true);
@@ -1587,6 +1603,7 @@ public class RegionVersionHolderJUnitTest extends TestCase {
    * Test a case in 46522 where the received exceptions end up 
    * not being in the RVV interval.
    */
+  @Test
   public void testConsumeReceivedRevisions() {
     testConsumeReceivedRevisions(false);
     testConsumeReceivedRevisions(true);
@@ -1630,7 +1647,8 @@ public class RegionVersionHolderJUnitTest extends TestCase {
       RVVException.UseTreeSetsForTesting = false;
     }
   }
-  
+
+  @Test
   public void testChangeSetForm() {
     try {
       RVVException.UseTreeSetsForTesting = true;
@@ -1667,12 +1685,12 @@ public class RegionVersionHolderJUnitTest extends TestCase {
    * 
    * See bug 47106
    */
+  @Test
   public void testDominates() {
     testDominates(false);
     testDominates(true);
   }
-  
-  
+
   private void testDominates(boolean useTreeSets) {
     try {
       RVVException.UseTreeSetsForTesting = useTreeSets;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
index d60a354..7821b6d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
@@ -16,18 +16,18 @@
  */
 package com.gemstone.gemfire.internal.cache.versions;
 
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import static org.junit.Assert.*;
 
-import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 /**
@@ -41,32 +41,16 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 @Category(UnitTest.class)
 public class RegionVersionHolderRandomJUnitTest extends RegionVersionHolderSmallBitSetJUnitTest {
   
-  Random random = new Random();
-  
+  private Random random;
+
   @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  protected final void postSetUpRegionVersionHolderSmallBitSetJUnitTest() throws Exception {
     long seed = System.nanoTime();
-//    seed = 1194319178069961L;
-    random.setSeed(seed);
+    random = new Random();
+    random.setSeed(seed); // 1194319178069961L;
     System.out.println("RegionVersionHolderJUnitTest using random seed " + seed);
   }
   
-  
-  int loopNum = 0;
-  /**
-   * Rerun all of the tests several times to see if anything fails.
-   * @throws InterruptedException
-   */
-//  public void testLoop() throws InterruptedException {
-//    for(int i =0; i < 50; i++) {
-//      loopNum=i;
-//      System.err.println("i=" + i);
-//      testInitializeFrom();
-//      testConsumeReceivedRevisions();
-//      testParallelThreads();
-//    }
-//  }
   /**
    * Record versions in random order, rather than in sequential order
    * This should generate and fill some exceptions.
@@ -92,17 +76,16 @@ public class RegionVersionHolderRandomJUnitTest extends RegionVersionHolderSmall
    * This tries to be a more "real life" test. A bunch of threads perform
    * updates, which should create exceptions. Verify that the final
    * exception list is correct.
-   * @throws InterruptedException
    */
+  @Test
   public void testParallelThreads() throws InterruptedException {
-    RegionVersionHolder vh1 = new RegionVersionHolder(member);
-    RegionVersionHolder vh2 = new RegionVersionHolder(member);
+    RegionVersionHolder vh1 = new RegionVersionHolder(member());
+    RegionVersionHolder vh2 = new RegionVersionHolder(member());
     
     int UPDATES = 50000;
     int NUM_UPDATERS=20;
     int NUM_EXCEPTIONS=500;
-//    int NUM_EXCEPTIONS=0;
-    
+
     Random random = new Random();
     IntOpenHashSet exceptions = new IntOpenHashSet();
     for(int i =0; i < NUM_EXCEPTIONS; i++) {
@@ -136,13 +119,9 @@ public class RegionVersionHolderRandomJUnitTest extends RegionVersionHolderSmall
     for(int i = 1; i < UPDATES; i++) {
       assertEquals("vector is incorrect on item "+  i,!exceptions.contains(i), vh2.contains(i));
     }
-    
   }
-  
-  
-  
+
   private static class HolderUpdater extends Thread {
-    
 
     private int updates;
     private int myNumber;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
index 3c9f09e..bd6199b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
@@ -27,20 +27,13 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 @Category(UnitTest.class)
 public class RegionVersionHolderSmallBitSetJUnitTest extends RegionVersionHolderJUnitTest {
   
-  
   @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    originalBitSetWidth = RegionVersionHolder.BIT_SET_WIDTH;
+  protected final void postSetUp() throws Exception {
     RegionVersionHolder.BIT_SET_WIDTH = 4;
+    postSetUpRegionVersionHolderSmallBitSetJUnitTest();
   }
-  
-  protected void tearDown() throws Exception {
-    super.tearDown();
-    RegionVersionHolder.BIT_SET_WIDTH = originalBitSetWidth;
+
+  protected void postSetUpRegionVersionHolderSmallBitSetJUnitTest() throws Exception {
   }
-  
-  
-  
 
 }


Mime
View raw message