geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [14/16] incubator-geode git commit: Updating and fixing tests
Date Tue, 26 Apr 2016 23:17:26 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImplJUnitTest.java
index 8171c67..6e370cd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.cache.client.internal;
 
+import static org.junit.Assert.*;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -28,8 +30,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.CancelCriterion;
@@ -46,11 +48,9 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-/**
- *
- */
 @Category(UnitTest.class)
-public class OpExecutorImplJUnitTest extends TestCase {
+public class OpExecutorImplJUnitTest {
+
   DummyManager manager;
   private LogWriter logger;
   private DummyEndpointManager endpointManager;
@@ -65,7 +65,8 @@ public class OpExecutorImplJUnitTest extends TestCase {
   protected int getPrimary;
   protected int getBackups;
   private CancelCriterion cancelCriterion;
-  
+
+  @Before
   public void setUp() {
     this.logger = new LocalLogWriter(InternalLogWriter.FINEST_LEVEL, System.out);
     this.endpointManager = new DummyEndpointManager();
@@ -74,22 +75,23 @@ public class OpExecutorImplJUnitTest extends TestCase {
     riTracker = new RegisterInterestTracker();
     cancelCriterion = new CancelCriterion() {
 
+      @Override
       public String cancelInProgress() {
         return null;
       }
 
+      @Override
       public RuntimeException generateCancelledException(Throwable e) {
         return null;
       }
     };
   }
   
-  public void tearDown() throws InterruptedException {
-  }
-  
+  @Test
   public void testExecute() throws Exception {
     OpExecutorImpl exec = new OpExecutorImpl(manager, queueManager, endpointManager, riTracker, 3, 10, false, cancelCriterion, null);
     Object result = exec.execute(new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         return "hello";
       }
@@ -108,6 +110,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
     try {
     result = exec.execute(new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         throw new SocketTimeoutException();
       }
@@ -130,6 +133,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
     try {
       result = exec.execute(new Op() {
+        @Override
         public Object attempt(Connection cnx) throws Exception {
           throw new ServerOperationException("Something didn't work");
         }
@@ -151,6 +155,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
     try {
       result = exec.execute(new Op() {
+        @Override
         public Object attempt(Connection cnx) throws Exception {
           throw new IOException("Something didn't work");
         }
@@ -179,13 +184,15 @@ public class OpExecutorImplJUnitTest extends TestCase {
     getPrimary = 0;
     getBackups = 0;
   }
-  
+
+  @Test
   public void testExecuteOncePerServer() throws Exception {
     OpExecutorImpl exec = new OpExecutorImpl(manager, queueManager, endpointManager, riTracker, -1, 10, false, cancelCriterion, null);
     
     manager.numServers = 5;
     try {
       exec.execute(new Op() {
+        @Override
         public Object attempt(Connection cnx) throws Exception {
           throw new IOException("Something didn't work");
         }
@@ -204,13 +211,15 @@ public class OpExecutorImplJUnitTest extends TestCase {
     assertEquals(6, invalidateConnections);
     assertEquals(6, serverCrashes);
   }
-  
+
+  @Test
   public void testRetryFailedServers() throws Exception {
     OpExecutorImpl exec = new OpExecutorImpl(manager, queueManager, endpointManager, riTracker, 10, 10, false, cancelCriterion, null);
     
     manager.numServers = 5;
     try {
       exec.execute(new Op() {
+        @Override
         public Object attempt(Connection cnx) throws Exception {
           throw new IOException("Something didn't work");
         }
@@ -230,10 +239,12 @@ public class OpExecutorImplJUnitTest extends TestCase {
     assertEquals(11, serverCrashes);
   }
 
+  @Test
   public void testExecuteOn() throws Exception {
     OpExecutorImpl exec = new OpExecutorImpl(manager,queueManager, endpointManager, riTracker, 3, 10, false, cancelCriterion, null);
     ServerLocation server = new ServerLocation("localhost", -1);
     Object result = exec.executeOn(server, new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         return "hello";
       }
@@ -252,6 +263,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
     try {
     result = exec.executeOn(server, new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         throw new SocketTimeoutException();
       }
@@ -273,6 +285,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
     try {
       result = exec.executeOn(server,new Op() {
+        @Override
         public Object attempt(Connection cnx) throws Exception {
           throw new ServerOperationException("Something didn't work");
         }
@@ -301,6 +314,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
       logger.info(addExpected);
       try {
         result = exec.executeOn(server,new Op() {
+          @Override
             public Object attempt(Connection cnx) throws Exception {
               throw new Exception("Something didn't work");
             }
@@ -321,10 +335,12 @@ public class OpExecutorImplJUnitTest extends TestCase {
     assertEquals(1, invalidateConnections);
     assertEquals(1, serverCrashes);
   }
-  
+
+  @Test
   public void testExecuteOnAllQueueServers() {
     OpExecutorImpl exec = new OpExecutorImpl(manager,queueManager, endpointManager, riTracker, 3, 10, false, cancelCriterion, null);
     exec.executeOnAllQueueServers(new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         return "hello";
       }
@@ -342,6 +358,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
     queueManager.backups = 3;
     exec.executeOnAllQueueServers(new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         throw new SocketTimeoutException();
       }
@@ -361,6 +378,7 @@ public class OpExecutorImplJUnitTest extends TestCase {
     queueManager.backups = 3;
     Object result = exec.executeOnQueuesAndReturnPrimaryResult(new Op() {
       int i = 0;
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         i++;
         if(i < 15) {
@@ -382,10 +400,12 @@ public class OpExecutorImplJUnitTest extends TestCase {
     
   }
 
+  @Test
   public void testThreadLocalConnection() {
     OpExecutorImpl exec = new OpExecutorImpl(manager,queueManager, endpointManager, riTracker, 3, 10, true, cancelCriterion, null);
     ServerLocation server = new ServerLocation("localhost", -1);
     Op op = new Op() {
+      @Override
       public Object attempt(Connection cnx) throws Exception {
         //do nothing
         return cnx;
@@ -417,21 +437,19 @@ public class OpExecutorImplJUnitTest extends TestCase {
     assertEquals(0, returns);
   }
   
-  public class DummyManager implements ConnectionManager {
+  private class DummyManager implements ConnectionManager {
+
     protected int numServers  = Integer.MAX_VALUE;
     private int currentServer = 0;
 
-    
     public DummyManager() {
     }
-    
-    
 
+    @Override
     public void emergencyClose() {
     }
 
-
-
+    @Override
     public Connection borrowConnection(long aquireTimeout) {
       borrows++;
       return new DummyConnection(new ServerLocation("localhost", currentServer++ % numServers));
@@ -440,180 +458,217 @@ public class OpExecutorImplJUnitTest extends TestCase {
     /* (non-Javadoc)
      * @see com.gemstone.gemfire.cache.client.internal.pooling.ConnectionManager#borrowConnection(com.gemstone.gemfire.distributed.internal.ServerLocation, long)
      */
+    @Override
     public Connection borrowConnection(ServerLocation server, long aquireTimeout,boolean onlyUseExistingCnx) {
       borrows++;
       return new DummyConnection(server);
     }
 
+    @Override
     public void close(boolean keepAlive) {
-      
-    }
-
-    public Map getEndpointMap() {
-      return null;
     }
 
+    @Override
     public void returnConnection(Connection connection) {
       returns++;
       
     }
+
+    @Override
     public void returnConnection(Connection connection, boolean accessed) {
       returns++;
       
     }
 
+    @Override
     public void start(ScheduledExecutorService backgroundProcessor) {
     }
 
-    public Connection exchangeConnection(Connection conn, Set excludedServers,
-        long aquireTimeout) {
+    @Override
+    public Connection exchangeConnection(Connection conn, Set excludedServers, long aquireTimeout) {
       if(excludedServers.size() >= numServers) {
         throw new NoAvailableServersException();
       }
       exchanges++;
       return new DummyConnection(new ServerLocation("localhost", currentServer++ % numServers));
     }
+
+    @Override
     public int getConnectionCount() {
       return 0;
     }
+
+    @Override
     public Connection getConnection(Connection conn) {
       return conn;
     }
-    public void activate(Connection conn) {}
-    public void passivate(Connection conn, boolean accessed) {}
+
+    @Override
+    public void activate(Connection conn) {
+    }
+
+    @Override
+    public void passivate(Connection conn, boolean accessed) {
+    }
   }
   
-  public class DummyConnection implements Connection {
+  private class DummyConnection implements Connection {
     
     private ServerLocation server;
 
     public DummyConnection(ServerLocation serverLocation) {
       this.server = serverLocation;
     }
+
+    @Override
     public void close(boolean keepAlive) throws Exception {
     }
+
+    @Override
     public void destroy() {
       invalidateConnections++;
     }
+
+    @Override
     public boolean isDestroyed() {
       return false;
     }
+
+    @Override
     public ByteBuffer getCommBuffer() {
       return null;
     }
 
+    @Override
     public ServerLocation getServer() {
       return server;
     }
 
+    @Override
     public Socket getSocket() {
       return null;
     }
 
+    @Override
     public ConnectionStats getStats() {
       return null;
     }
-    
+
+    @Override
     public int getDistributedSystemId() {
       return 0;
     }
 
-
+    @Override
     public Endpoint getEndpoint() {
       return new Endpoint(null,null,null,null, null);
     }
 
-    public void setEndpoint(Endpoint endpoint) {
-    }
-
+    @Override
     public ServerQueueStatus getQueueStatus() {
       return null;
     }
 
+    @Override
     public Object execute(Op op) throws Exception {
       return op.attempt(this);
     }
-    
+
+    @Override
     public void emergencyClose() {
     }
-    
+
+    @Override
     public short getWanSiteVersion(){
       return -1;
     }
-    
+
+    @Override
     public void setWanSiteVersion(short wanSiteVersion){
     }
+
+    @Override
     public InputStream getInputStream() {
       return null;
     }
+
+    @Override
     public OutputStream getOutputStream() {
       return null;
-    } 
+    }
+
+    @Override
     public void setConnectionID(long id) {
     }
+
+    @Override
     public long getConnectionID() {
       return 0;
     }
   }
   
-    
-  public class DummyEndpointManager implements EndpointManager {
-
-    
+  private class DummyEndpointManager implements EndpointManager {
 
+    @Override
     public void addListener(EndpointListener listener) {
     }
 
+    @Override
     public void close() {
     }
 
+    @Override
     public Endpoint referenceEndpoint(ServerLocation server, DistributedMember memberId) {
       return null;
     }
 
+    @Override
     public Map getEndpointMap() {
       return null;
     }
 
+    @Override
     public void removeListener(EndpointListener listener) {
-      
     }
 
+    @Override
     public void serverCrashed(Endpoint endpoint) {
       serverCrashes++;
     }
+
+    @Override
     public int getConnectedServerCount() {
       return 0;
     }
 
-    public void fireEndpointNowInUse(Endpoint endpoint) {
-      // TODO Auto-generated method stub
-      
-    }
-
+    @Override
     public Map getAllStats() {
       return null;
     }
 
+    @Override
     public String getPoolName() {
       return null;
     }
   }
   
-  public class DummyQueueManager implements QueueManager {
+  private class DummyQueueManager implements QueueManager {
+
     int backups = 0;
     int currentServer = 0;
+
     public QueueConnections getAllConnectionsNoWait() {
       return getAllConnections();
     }
-    
+
+    @Override
     public void emergencyClose() {
     }
 
-
-
+    @Override
     public QueueConnections getAllConnections() {
       return new QueueConnections() {
+        @Override
         public List getBackups() {
           getBackups++;
           ArrayList result = new ArrayList(backups);
@@ -622,41 +677,47 @@ public class OpExecutorImplJUnitTest extends TestCase {
           }
           return result;
         }
+        @Override
         public Connection getPrimary() {
           getPrimary++;
           return new DummyConnection(new ServerLocation("localhost", currentServer++));
         }
+        @Override
         public QueueConnectionImpl getConnection(Endpoint ep) {
           return null;
         }
       };
     }
 
+    @Override
     public void close(boolean keepAlive) {
     }
 
+    @Override
     public void start(ScheduledExecutorService background) {
     }
-    
-    
+
+    @Override
     public QueueState getState() {
       return null;
     }
 
+    @Override
     public InternalPool getPool() {
       return null;
     }
 
+    @Override
     public void readyForEvents(InternalDistributedSystem system) {
     }
-    
+
+    @Override
     public InternalLogWriter getSecurityLogger() {
       return null;
     }
 
+    @Override
     public void checkEndpoint(ClientUpdater qc, Endpoint endpoint) {
-      // TODO Auto-generated method stub
-      
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ServerBlackListJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ServerBlackListJUnitTest.java
index 8a9d7a1..e9e50c2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ServerBlackListJUnitTest.java
@@ -28,21 +28,17 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.admin.DistributedSystemConfig;
 import com.gemstone.gemfire.cache.client.internal.ServerBlackList.BlackListListenerAdapter;
 import com.gemstone.gemfire.cache.client.internal.ServerBlackList.FailureTracker;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.util.StopWatch;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-/**
- *
- */
 @Category(UnitTest.class)
 public class ServerBlackListJUnitTest {
   
   private ScheduledExecutorService background;
-  protected ServerBlackList blackList;
+  private ServerBlackList blackList;
 
   @Before
   public void setUp()  throws Exception {
@@ -67,12 +63,8 @@ public class ServerBlackListJUnitTest {
     assertEquals(Collections.singleton(location1),  blackList.getBadServers());
     
     boolean done = false;
-    try {
-      for (StopWatch time = new StopWatch(true); !done && time.elapsedTimeMillis() < 10000; done = (blackList.getBadServers().size() == 0)) {
-        Thread.sleep(200);
-      }
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    for (StopWatch time = new StopWatch(true); !done && time.elapsedTimeMillis() < 10000; done = (blackList.getBadServers().size() == 0)) {
+      Thread.sleep(200);
     }
     assertTrue("blackList still has bad servers", done);
     
@@ -81,15 +73,16 @@ public class ServerBlackListJUnitTest {
 
   @Test
   public void testListener()  throws Exception {
-    
     final AtomicInteger adds = new AtomicInteger();
     final AtomicInteger removes = new AtomicInteger();
     blackList.addListener(new BlackListListenerAdapter() {
 
+      @Override
       public void serverAdded(ServerLocation location) {
         adds.incrementAndGet();
       }
 
+      @Override
       public void serverRemoved(ServerLocation location) {
         removes.incrementAndGet();
       }
@@ -107,12 +100,8 @@ public class ServerBlackListJUnitTest {
     assertEquals(0, removes.get());
     
     boolean done = false;
-    try {
-      for (StopWatch time = new StopWatch(true); !done && time.elapsedTimeMillis() < 10000; done = (removes.get() != 0)) {
-        Thread.sleep(200);
-      }
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
+    for (StopWatch time = new StopWatch(true); !done && time.elapsedTimeMillis() < 10000; done = (removes.get() != 0)) {
+      Thread.sleep(200);
     }
     assertTrue("removes still empty", done);
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
index f7a960b..165dcd4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.client.internal.locator;
 
 import static org.junit.Assert.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index 6360d59..fc06afd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -448,8 +448,8 @@ public class ConnectionManagerJUnitTest {
     
 //     //wait to make sure checked out connections aren't timed out
 //     Thread.sleep(idleTimeout + 100);
-//     Assert.assertEquals(5,factory.creates);
-//     Assert.assertEquals(0,factory.destroys);
+//     Assert.assertIndexDetailsEquals(5,factory.creates);
+//     Assert.assertIndexDetailsEquals(0,factory.destroys);
     
 //     manager.returnConnection(conn1);
 //     manager.returnConnection(conn2);
@@ -468,8 +468,8 @@ public class ConnectionManagerJUnitTest {
 //     long elapsed = System.currentTimeMillis() - start;
 //     Assert.assertTrue(elapsed > idleTimeout);
     
-//     Assert.assertEquals(5,factory.creates);
-//     Assert.assertEquals(3,factory.destroys);
+//     Assert.assertIndexDetailsEquals(5,factory.creates);
+//     Assert.assertIndexDetailsEquals(3,factory.destroys);
   }
   
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
index 9f57fc0..b8d5008 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
@@ -474,7 +474,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
                     primaryCount++;
                   }
                 }
-                //assertEquals(memberSizes[membersIdx] * (1024* 1024), 
+                //assertIndexDetailsEquals(memberSizes[membersIdx] * (1024* 1024),
                 //             totalBucketBytes);
                 assertEquals(memberPrimaryCounts[membersIdx], primaryCount);
                 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
index 7b265f9..8df44ea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
@@ -16,24 +16,13 @@
  */
 package com.gemstone.gemfire.cache.operations;
 
-import static org.junit.Assert.*;
-import static org.junit.matchers.JUnitMatchers.*;
-
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Properties;
 
-import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.matchers.JUnitMatchers;
-import org.junit.rules.ExpectedException;
 
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.cache.Cache;
@@ -42,30 +31,11 @@ import com.gemstone.gemfire.pdx.PdxInstance;
 import com.gemstone.gemfire.pdx.PdxReader;
 import com.gemstone.gemfire.pdx.PdxSerializable;
 import com.gemstone.gemfire.pdx.PdxWriter;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
 public class PutOperationContextJUnitTest {
 
-  @Rule
-  public ExpectedException expectedException = ExpectedException.none();
-  
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-  }
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @After
-  public void tearDown() throws Exception {
-  }
-
   @Test
   public void testGetSerializedValue() throws IOException {
     {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
index 8efec6e..9ebbbf3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
@@ -16,57 +16,24 @@
  */
 package com.gemstone.gemfire.cache.operations.internal;
 
-import static org.junit.Assert.*;
-import static org.junit.matchers.JUnitMatchers.*;
-
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Properties;
 
-import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.matchers.JUnitMatchers;
-import org.junit.rules.ExpectedException;
 
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.operations.PutOperationContextJUnitTest;
 import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
 public class GetOperationContextImplJUnitTest {
 
-  @Rule
-  public ExpectedException expectedException = ExpectedException.none();
-  
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-  }
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @After
-  public void tearDown() throws Exception {
-  }
-
   @Test
   public void testGetSerializedValue() throws IOException {
     {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
index d09c6e0..6910089 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -115,7 +115,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
           //when we get to the last bucket, which should be primary on that node, we
           //don't even put a copy of the bucket on that node
           // See bug #40470
-//          assertEquals(4, member.getPrimaryCount());
+//          assertIndexDetailsEquals(4, member.getPrimaryCount());
         }
       }
     };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
index 88d0e30..78ec8b6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
@@ -361,7 +361,7 @@ public class CacheUtils {
           if (p1 instanceof Struct) { 
             Object[] values1 = ((Struct)p1).getFieldValues(); 
             Object[] values2 = ((Struct)p2).getFieldValues(); 
-            //test.assertEquals(values1.length, values2.length); 
+            //test.assertIndexDetailsEquals(values1.length, values2.length);
             if(values1.length != values2.length) { 
               ok = false; 
               break outer; 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
index 934798c..0498a79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.query.dunit;
 
 import java.io.IOException;
@@ -60,16 +60,16 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
-import com.gemstone.gemfire.pdx.internal.PdxString;
-import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.NetworkUtils;
-import com.gemstone.gemfire.test.dunit.SerializableCallable;
-import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.pdx.internal.PdxString;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 
 public class PdxStringQueryDUnitTest extends CacheTestCase{
@@ -82,8 +82,8 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
   private final String rootRegionName = "root";
   private final String regionName = "PdxTest";
   private final String regName = "/" + rootRegionName + "/" + regionName;
-  private final static int orderByQueryIndex = 11;
-  private final static int [] groupByQueryIndex = new int[]{7, 8, 9,10};
+  private final static int orderByQueryIndex = 11;
+  private final static int [] groupByQueryIndex = new int[]{7, 8, 9,10};
   
   private final String[] queryString = new String[] { 
       "SELECT pos.secId FROM " + regName + " p, p.positions.values pos WHERE pos.secId LIKE '%L'",//0
@@ -92,10 +92,10 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
       "SELECT pos.secId FROM " + regName + " p, p.positions.values pos WHERE pos.secId > 'APPL' and pos.secId < 'SUN'",//3
       "select pos.secId from " + regName + " p, p.positions.values pos where pos.secId  IN SET ('YHOO', 'VMW')",//4
       "select pos.secId from " + regName + " p, p.positions.values pos where NOT (pos.secId = 'VMW')",//5
-      "select pos.secId from " + regName + " p, p.positions.values pos where NOT (pos.secId IN SET('SUN', 'ORCL')) ",//6
-      "select pos.secId , count(pos.id) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' group by pos.secId ",//7
-      "select pos.secId , sum(pos.id) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' group by pos.secId ",//8,
-      "select pos.secId , count(distinct pos.secId) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' group by pos.secId ",//9
+      "select pos.secId from " + regName + " p, p.positions.values pos where NOT (pos.secId IN SET('SUN', 'ORCL')) ",//6
+      "select pos.secId , count(pos.id) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' group by pos.secId ",//7
+      "select pos.secId , sum(pos.id) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' group by pos.secId ",//8,
+      "select pos.secId , count(distinct pos.secId) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' group by pos.secId ",//9
       "select  count(distinct pos.secId) from " + regName + " p, p.positions.values pos where  pos.secId > 'APPL' ",//10
       "SELECT distinct pos.secId FROM " + regName + " p, p.positions.values pos order by pos.secId",//11
       "SELECT distinct pos.secId FROM " + regName + " p, p.positions.values pos WHERE p.ID > 1 order by pos.secId limit 5",//12
@@ -108,10 +108,10 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
       "SELECT pos.secIdIndexed FROM " + regName + " p, p.positions.values pos WHERE pos.secIdIndexed > 'APPL' and pos.secIdIndexed < 'SUN'",//3
       "select pos.secIdIndexed from " + regName + " p, p.positions.values pos where pos.secIdIndexed  IN SET ('YHOO', 'VMW')",//4
       "select pos.secIdIndexed from " + regName + " p, p.positions.values pos where NOT (pos.secIdIndexed = 'VMW')",//5
-      "select pos.secIdIndexed from " + regName + " p, p.positions.values pos where NOT (pos.secIdIndexed IN SET('SUN', 'ORCL')) ",//6
-      "select pos.secIdIndexed , count(pos.id) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL' group by pos.secIdIndexed ",//7
-      "select pos.secIdIndexed , sum(pos.id) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL' group by pos.secIdIndexed ",//8
-      "select pos.secIdIndexed , count(distinct pos.secIdIndexed) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL' group by pos.secIdIndexed ",//9
+      "select pos.secIdIndexed from " + regName + " p, p.positions.values pos where NOT (pos.secIdIndexed IN SET('SUN', 'ORCL')) ",//6
+      "select pos.secIdIndexed , count(pos.id) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL' group by pos.secIdIndexed ",//7
+      "select pos.secIdIndexed , sum(pos.id) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL' group by pos.secIdIndexed ",//8
+      "select pos.secIdIndexed , count(distinct pos.secIdIndexed) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL' group by pos.secIdIndexed ",//9
       "select  count(distinct pos.secIdIndexed) from " + regName + " p, p.positions.values pos where  pos.secIdIndexed > 'APPL'  ",//10
       "SELECT distinct pos.secIdIndexed FROM " + regName + " p, p.positions.values pos order by pos.secIdIndexed",//11
       "SELECT distinct pos.secIdIndexed FROM " + regName + " p, p.positions.values pos WHERE p.ID > 1 order by pos.secIdIndexed limit 5",//12
@@ -930,8 +930,8 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
 
             if(i < orderByQueryIndex){
               // Compare local and remote query results.
-              if (!compareResultsOfWithAndWithoutIndex(rs)){
-                LogWriterUtils.getLogWriter().info("result0="+rs[0][0].asList());
+              if (!compareResultsOfWithAndWithoutIndex(rs)){
+                LogWriterUtils.getLogWriter().info("result0="+rs[0][0].asList());
                 LogWriterUtils.getLogWriter().info("result1="+rs[0][1].asList());
                fail("Local and Remote Query Results are not matching for query :" + queryString[i]);  
               }
@@ -1417,8 +1417,8 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
                    
             if(i < orderByQueryIndex){
               // Compare local and remote query results.
-              if (!compareResultsOfWithAndWithoutIndex(rs)){
-                LogWriterUtils.getLogWriter().info("result0="+rs[0][0].asList());
+              if (!compareResultsOfWithAndWithoutIndex(rs)){
+                LogWriterUtils.getLogWriter().info("result0="+rs[0][0].asList());
                 LogWriterUtils.getLogWriter().info("result1="+rs[0][1].asList());
                fail("Local and Remote Query Results are not matching for query :" + queryString[i]);  
               }
@@ -1689,38 +1689,38 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
     }
   }
   
-  private void checkForPdxString(List results, String query) {
-    boolean isGroupByQuery = false;
-    for (int i : groupByQueryIndex) {
-      if (query.equals(queryString[i]) || query.equals(queryString2[i])) {
-        isGroupByQuery = true;
-        break;
-      }
-    }
-    for (Object o : results) {
-      if (o instanceof Struct) {
-        if (!isGroupByQuery) {
-          Object o1 = ((Struct) o).getFieldValues()[0];
-          Object o2 = ((Struct) o).getFieldValues()[1];
-          if (!(o1 instanceof String)) {
-            fail("Returned instance of " + o1.getClass()
-                + " instead of String for query: " + query);
-          }
-
-          if (!(o2 instanceof String)) {
-            fail("Returned instance of " + o2.getClass()
-                + " instead of String for query: " + query);
-          }
-        }
-      } else {
-        if (!isGroupByQuery) {
-          if (!(o instanceof String)) {
-            fail("Returned instance of " + o.getClass()
-                + " instead of String for query: " + query);
-          }
-        }
-      }
-    }
+  private void checkForPdxString(List results, String query) {
+    boolean isGroupByQuery = false;
+    for (int i : groupByQueryIndex) {
+      if (query.equals(queryString[i]) || query.equals(queryString2[i])) {
+        isGroupByQuery = true;
+        break;
+      }
+    }
+    for (Object o : results) {
+      if (o instanceof Struct) {
+        if (!isGroupByQuery) {
+          Object o1 = ((Struct) o).getFieldValues()[0];
+          Object o2 = ((Struct) o).getFieldValues()[1];
+          if (!(o1 instanceof String)) {
+            fail("Returned instance of " + o1.getClass()
+                + " instead of String for query: " + query);
+          }
+
+          if (!(o2 instanceof String)) {
+            fail("Returned instance of " + o2.getClass()
+                + " instead of String for query: " + query);
+          }
+        }
+      } else {
+        if (!isGroupByQuery) {
+          if (!(o instanceof String)) {
+            fail("Returned instance of " + o.getClass()
+                + " instead of String for query: " + query);
+          }
+        }
+      }
+    }
   }
 
   public boolean compareResultsOfWithAndWithoutIndex(SelectResults[][] r ) { 
@@ -1759,7 +1759,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
           if (p1 instanceof Struct) { 
             Object[] values1 = ((Struct)p1).getFieldValues(); 
             Object[] values2 = ((Struct)p2).getFieldValues(); 
-            //test.assertEquals(values1.length, values2.length); 
+            //test.assertIndexDetailsEquals(values1.length, values2.length);
             if(values1.length != values2.length) { 
               ok = false; 
               break outer; 
@@ -1966,7 +1966,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
     vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
       public void run2() throws CacheException {
         // Create Cache.
-        getLonerSystem();
+        getLonerSystem();
         IgnoredException.addIgnoredException("Connection refused");
         getCache();        
         PoolFactory cpf = PoolManager.createFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 4e94e8b..a87c243 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -567,7 +567,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
         Assert.fail("Failed executing " + queryString, e);
       }
       LogWriterUtils.getLogWriter().fine("size: " + results.size());
-      //assertEquals(numberOfEntries, results.size());
+      //assertIndexDetailsEquals(numberOfEntries, results.size());
       assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
     });
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 6769a0e..9b8ae0c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -201,7 +201,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
           } catch (Exception e) {
             fail("Failed executing " + queryString, e);
         }
-          assertEquals(100, results.size());
+          assertIndexDetailsEquals(100, results.size());
           assertTrue(results instanceof ResultsCollectionWrapper);
           IdComparator comparator = new IdComparator();
           Object[] resultsArray = results.toArray();
@@ -659,7 +659,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
             Assert.fail("Failed executing " + queryString, e);
           }
           LogWriterUtils.getLogWriter().fine("size: " + results.size());
-          //assertEquals(numberOfEntries, results.size());
+          //assertIndexDetailsEquals(numberOfEntries, results.size());
           assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
         }
       });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
index b6d7af0..7b28cae 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
@@ -216,7 +216,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -271,7 +271,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -325,7 +325,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -360,7 +360,7 @@ public class CountStarJUnitTest {
     //Verify Index Creation
     //assertNotNull(queryService.getIndex(region, "sampleIndex-1"));
     //assertNotNull(queryService.getIndex(region, "sampleIndex-2"));
-    //assertEquals(3, queryService.getIndexes().size());
+    //assertIndexDetailsEquals(3, queryService.getIndexes().size());
 
     //Run queries
     Query query1 = null;
@@ -380,7 +380,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -423,7 +423,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -465,7 +465,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query with indexes: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -582,7 +582,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarDistinctQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarDistinctQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();
@@ -619,7 +619,7 @@ public class CountStarJUnitTest {
         //Also verify with size of result2 to count
         assertEquals("COUNT(*) query result is wrong for query: " + queryStr , result2.size(), count);
         
-        //assertEquals("Query: "+ queryStr, countStarDistinctQueries.get(queryStr).intValue(), count);
+        //assertIndexDetailsEquals("Query: "+ queryStr, countStarDistinctQueries.get(queryStr).intValue(), count);
       }
     } catch (Exception e){
       e.printStackTrace();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
index c12d820..f326fb9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
@@ -137,7 +137,7 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
           if( !(indexUsed).equals("statusIndexPf1")){
             fail("<statusIndexPf1> was expected but found "+indexUsed);
           }
-          //assertEquals("statusIndexPf1",itr.next().toString());
+          //assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -231,7 +231,7 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
             fail("indices used do not match with those which are expected to be used" +
                 "<statusIndexPf1> and <empIdIndex> were expected but found " +itr.next());
           }
-          //assertEquals("statusIndexPf1",itr.next().toString());
+          //assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
       } catch (Exception e) {
@@ -843,7 +843,7 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
             if(  !(temp.equals("idIndexPf") || temp.equals("empIdIndexPf2") || temp.equals("statusIndexPf"))){
               fail("<idIndexPf> or <empIdIndexPf2>    was expected but found "+temp.toString());
             }
-            //assertEquals("statusIndexPf1",itr.next().toString());
+            //assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
           }
 
           if (i != 3 /* For join query without parenthesis */) {
@@ -945,7 +945,7 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
             if(  !(temp.equals("idIndexPf") || temp.equals("empIdIndexPf2"))){
               fail("<idIndexPf> or <empIdIndexPf2>    was expected but found "+temp.toString());
             }
-            //assertEquals("statusIndexPf1",itr.next().toString());
+            //assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
           }
 
           int indxs = observer.indexesUsed.size();
@@ -1054,7 +1054,7 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
               fail("<idIndexPf> or <empIdIndexPf2>    was expected but found "
                   + temp.toString());
             }
-            // assertEquals("statusIndexPf1",itr.next().toString());
+            // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
           }
 
           int indxs = observer.indexesUsed.size();
@@ -1232,7 +1232,7 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
             if(  !(temp.equals("ageIndexemp")||temp.equals("idIndexPf") || temp.equals("empIdIndexPf2") || temp.equals("statusIndexPf3"))){
               fail("<idIndexPf> or <empIdIndexPf2>    was expected but found "+temp.toString());
             }
-            //assertEquals("statusIndexPf1",itr.next().toString());
+            //assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
           }
 
           int indxs = observer.indexesUsed.size();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
index 168bb57..6f70ecf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
@@ -102,7 +102,7 @@ public class IndexMaintenanceAsynchJUnitTest {
   public void testAddEntry() throws Exception {
 
     new NewThread(region, index);
-    //assertEquals(5, stats.getNumberOfValues());
+    //assertIndexDetailsEquals(5, stats.getNumberOfValues());
     Thread.sleep(12000);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/JavaSerializationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/JavaSerializationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/JavaSerializationJUnitTest.java
index 0242e39..c300a1c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/JavaSerializationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/JavaSerializationJUnitTest.java
@@ -16,15 +16,16 @@
  */
 package com.gemstone.gemfire.cache.query.functional;
 
+import static org.junit.Assert.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import junit.framework.TestCase;
-
 import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.internal.StructImpl;
 import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl;
@@ -33,12 +34,9 @@ import com.gemstone.gemfire.cache.query.types.ObjectType;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
-public class JavaSerializationJUnitTest extends TestCase {
-  
-  public JavaSerializationJUnitTest(String testName) {
-    super(testName);
-  }
-  
+public class JavaSerializationJUnitTest {
+
+  @Test
   public void testStructImplSerialization() throws Exception {
     String[] fieldNames = {"col1", "col2"};
     ObjectType[] fieldTypes = {new ObjectTypeImpl(Integer.class), new ObjectTypeImpl(String.class)};
@@ -47,7 +45,8 @@ public class JavaSerializationJUnitTest extends TestCase {
     StructImpl si = new StructImpl(type, values);
     verifyJavaSerialization(si);   
   }
-  
+
+  @Test
   public void testUndefinedSerialization() throws Exception {
     verifyJavaSerialization(QueryService.UNDEFINED);   
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java
index c8f08a1..5280dfb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LimitClauseJUnitTest.java
@@ -1289,14 +1289,14 @@ public class LimitClauseJUnitTest {
       assertTrue(idIndex instanceof CompactRangeIndex);
       SelectResults resultsWithIndex = (SelectResults) query.execute();
 
-      assertEquals(resultsNoIndex.size(), resultsWithIndex.size());
-      assertEquals(limit, resultsWithIndex.size());
+      assertIndexDetailsEquals(resultsNoIndex.size(), resultsWithIndex.size());
+      assertIndexDetailsEquals(limit, resultsWithIndex.size());
       
       int expectedId = 6;
       Iterator iterator = resultsNoIndex.iterator();
       while (iterator.hasNext()) {
         Portfolio p = (Portfolio) iterator.next();
-        assertEquals(expectedId++, p.ID);
+        assertIndexDetailsEquals(expectedId++, p.ID);
       }
       
       //check order by results
@@ -1304,7 +1304,7 @@ public class LimitClauseJUnitTest {
       iterator = resultsWithIndex.iterator();
       while (iterator.hasNext()) {
         Portfolio p = (Portfolio) iterator.next();
-        assertEquals(expectedId++, p.ID);
+        assertIndexDetailsEquals(expectedId++, p.ID);
       }      
   }
  */ 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java
index cb2a5f1..4bd3258 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MiscJUnitTest.java
@@ -320,7 +320,7 @@ public class MiscJUnitTest {
       j = 0;
       while ( itr.hasNext()) {
        Struct struct = (Struct)itr.next();
-       assertEquals(j++, ((Integer)struct.get("getID")).intValue());
+       assertIndexDetailsEquals(j++, ((Integer)struct.get("getID")).intValue());
       }*/      
     }
     catch (Exception e) {      
@@ -614,22 +614,22 @@ public class MiscJUnitTest {
     String qStr = "Select distinct * from /portfolios pf where pf.getID() > Integer.MIN_VALUE"; 
     Query q = qs.newQuery(qStr);
     SelectResults result = (SelectResults) q.execute();
-    assertEquals(result.size(),4);  
+    assertIndexDetailsEquals(result.size(),4);
     
     qStr = "Select distinct * from /portfolios pf where pf.getID() > Integer.MAX_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),0);
+    assertIndexDetailsEquals(result.size(),0);
     
     qStr = "Select distinct * from /portfolios pf where pf.getID() > \"Long\".MAX_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),0);
+    assertIndexDetailsEquals(result.size(),0);
     
     qStr = "Select distinct * from /portfolios pf where pf.getID() > \"Long\".MIN_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),4);
+    assertIndexDetailsEquals(result.size(),4);
     
     qStr = "Select distinct * from /portfolios pf where pf.getID() > integer.MIN_VALUE"; 
     q = qs.newQuery(qStr);
@@ -643,22 +643,22 @@ public class MiscJUnitTest {
     qStr = "Select distinct * from /portfolios pf where pf.intFunction(Integer.MIN_VALUE) = Integer.MIN_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),4);
+    assertIndexDetailsEquals(result.size(),4);
     
     qStr = "Select distinct * from /portfolios pf where pf.intFunction(Integer.MAX_VALUE) = Integer.MAX_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),4);
+    assertIndexDetailsEquals(result.size(),4);
     
     qStr = "Select distinct * from /portfolios pf where pf.longFunction( \"Long\".MAX_VALUE) = \"Long\".MAX_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),4);
+    assertIndexDetailsEquals(result.size(),4);
     
     qStr = "Select distinct * from /portfolios pf where pf.longFunction(\"Long\".MIN_VALUE) = \"Long\".MIN_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),4);
+    assertIndexDetailsEquals(result.size(),4);
       
     qStr = "Select distinct * from /portfolios pf where pf.Integer.MAX_VALUE = Integer.MAX_VALUE"; 
     q = qs.newQuery(qStr);
@@ -672,8 +672,8 @@ public class MiscJUnitTest {
     qStr = "Select distinct Integer.MAX_VALUE from /portfolios pf where Integer.MAX_VALUE = Integer.MAX_VALUE"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),1);
-    assertEquals(result.iterator().next(),Integer.valueOf(Integer.MAX_VALUE));
+    assertIndexDetailsEquals(result.size(),1);
+    assertIndexDetailsEquals(result.iterator().next(),Integer.valueOf(Integer.MAX_VALUE));
     
     
   }
@@ -687,27 +687,27 @@ public class MiscJUnitTest {
     String qStr = "Select distinct * from /tempdata td where td.Integer.MAX_VALUE > Integer.MAX_VALUE"; 
     Query q = qs.newQuery(qStr);
     SelectResults result = (SelectResults) q.execute();
-    assertEquals(result.size(),0);  
+    assertIndexDetailsEquals(result.size(),0);
     
     qStr = "Select distinct * from /tempdata td where td.Integer.MAX_VALUE = 2 "; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),1);
+    assertIndexDetailsEquals(result.size(),1);
        
     qStr = "Select distinct * from /tempdata td where Integer.MAX_VALUE = 2 "; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),0);
+    assertIndexDetailsEquals(result.size(),0);
     
     qStr = "Select distinct * from /tempdata td where Integer.MAX_VALUE.intValue = Integer.MAX_VALUE "; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),0);
+    assertIndexDetailsEquals(result.size(),0);
     
     qStr = "Select distinct * from /tempdata td where Integer.test = 'test'"; 
     q = qs.newQuery(qStr);
     result = (SelectResults) q.execute();
-    assertEquals(result.size(),1);
+    assertIndexDetailsEquals(result.size(),1);
   }  
   
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index 4354b89..4b6071c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -206,8 +206,8 @@ public class MultiRegionIndexUsageJUnitTest {
       }
 
       // while(itr.hasNext()){
-      // assertEquals("villageName1", itr.next().toString());
-      // assertEquals("cityName2", itr.next().toString());
+      // assertIndexDetailsEquals("villageName1", itr.next().toString());
+      // assertIndexDetailsEquals("cityName2", itr.next().toString());
       // }
 
       CacheUtils.log("5555555555555555555555555555");
@@ -269,8 +269,8 @@ public class MultiRegionIndexUsageJUnitTest {
         }
       }
 
-      // assertEquals("villageName1", itr.next().toString());
-      // assertEquals("cityName3", itr.next().toString());
+      // assertIndexDetailsEquals("villageName1", itr.next().toString());
+      // assertIndexDetailsEquals("cityName3", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
 
@@ -404,8 +404,8 @@ public class MultiRegionIndexUsageJUnitTest {
         }
       }
 
-      // assertEquals("districtName3", itr.next().toString());
-      // assertEquals("stateName2", itr.next().toString());
+      // assertIndexDetailsEquals("districtName3", itr.next().toString());
+      // assertIndexDetailsEquals("stateName2", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
 
@@ -461,8 +461,8 @@ public class MultiRegionIndexUsageJUnitTest {
         }
       }
 
-      // assertEquals("cityName1", itr.next().toString());
-      // assertEquals("cityName2", itr.next().toString());
+      // assertIndexDetailsEquals("cityName1", itr.next().toString());
+      // assertIndexDetailsEquals("cityName2", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
       CacheUtils.log("------------- testCutDown1 end------------- ");
@@ -516,8 +516,8 @@ public class MultiRegionIndexUsageJUnitTest {
         }
       }
 
-      // assertEquals("stateName2", itr.next().toString());
-      // assertEquals("cityName1", itr.next().toString());
+      // assertIndexDetailsEquals("stateName2", itr.next().toString());
+      // assertIndexDetailsEquals("cityName1", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
       CacheUtils.log("------------- testSelectAsFromClause end------------- ");
@@ -571,9 +571,9 @@ public class MultiRegionIndexUsageJUnitTest {
         }
       }
 
-      // assertEquals("cityName3", itr.next().toString());
-      // assertEquals("cityName1", itr.next().toString());
-      // assertEquals("stateName1", itr.next().toString());
+      // assertIndexDetailsEquals("cityName3", itr.next().toString());
+      // assertIndexDetailsEquals("cityName1", itr.next().toString());
+      // assertIndexDetailsEquals("stateName1", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
       CacheUtils.log("------------- testSelectAsWhereClause end------------- ");
@@ -665,8 +665,8 @@ public class MultiRegionIndexUsageJUnitTest {
         }
       }
 
-      // assertEquals("cityName", itr.next().toString());
-      // assertEquals("stateName", itr.next().toString());
+      // assertIndexDetailsEquals("cityName", itr.next().toString());
+      // assertIndexDetailsEquals("stateName", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
       CacheUtils.log("------------- testFunctionUse2 end------------- ");
@@ -741,7 +741,7 @@ public class MultiRegionIndexUsageJUnitTest {
       QueryObserverHolder.setInstance(observer);
       rs[0][1] = (SelectResults) q.execute();
 
-      // assertEquals("districtName3", itr.next().toString());
+      // assertIndexDetailsEquals("districtName3", itr.next().toString());
 
       areResultsMatching(rs, new String[] { sqlStr });
       CacheUtils.log("------------- testFunctionUse4 end------------- ");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
index 9f8ef4f..7ddb6b4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
@@ -160,7 +160,7 @@ public class NonDistinctOrderByReplicatedJUnitTest extends NonDistinctOrderByTes
           if (!(indexUsed).equals("PKIDIndexPf1")) {
             fail("<PKIDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -259,7 +259,7 @@ public class NonDistinctOrderByReplicatedJUnitTest extends NonDistinctOrderByTes
           if (!(indexUsed).equals("PKIDIndexPf1")) {
             fail("<PKIDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByTestImplementation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByTestImplementation.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByTestImplementation.java
index 41e0413..4feadaf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByTestImplementation.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NonDistinctOrderByTestImplementation.java
@@ -164,7 +164,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(itr.next().toString()).equals("IDIndexPf1")) {
             fail("<IDIndexPf1> was expected but found " + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -255,7 +255,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           limit = Integer.parseInt(queries[i].substring(indexLimit + 5).trim());
         }
         assertTrue(!limitQuery || rcw.size() <= limit);
-        // assertEquals("Set",rcw.getCollectionType().getSimpleClassName());
+        // assertIndexDetailsEquals("Set",rcw.getCollectionType().getSimpleClassName());
         if (!rcw.getCollectionType().isOrdered()) {
           fail("The collection type="+rcw.getCollectionType().getSimpleClassName()+"  is not ordered");
         }
@@ -269,7 +269,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(itr.next().toString()).equals("IDIndexPf1")) {
             fail("<IDIndexPf1> was expected but found " + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -368,7 +368,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(itr.next().toString()).equals("IDIndexPf1")) {
             fail("<IDIndexPf1> was expected but found " + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -468,7 +468,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(itr.next().toString()).equals("IDIndexPf1")) {
             fail("<IDIndexPf1> was expected but found " + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -571,7 +571,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(indexUsed).equals("IDIndexPf1")) {
             fail("<IDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -674,7 +674,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(indexUsed).equals("IDIndexPf1")) {
             fail("<IDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -775,7 +775,7 @@ public abstract class NonDistinctOrderByTestImplementation {
           if (!(indexUsed).equals("PKIDIndexPf1")) {
             fail("<PKIDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByReplicatedJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByReplicatedJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByReplicatedJUnitTest.java
index 84f9350..e1372e9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByReplicatedJUnitTest.java
@@ -491,7 +491,7 @@ public class OrderByReplicatedJUnitTest extends OrderByTestImplementation {
           if (!(indexUsed).equals("PKIDIndexPf1")) {
             fail("<PKIDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -624,7 +624,7 @@ public class OrderByReplicatedJUnitTest extends OrderByTestImplementation {
           if (!(indexUsed).equals("PKIDIndexPf1")) {
             fail("<PKIDIndexPf1> was expected but found " + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByTestImplementation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByTestImplementation.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByTestImplementation.java
index 71e2c6d..206346e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByTestImplementation.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/OrderByTestImplementation.java
@@ -164,7 +164,7 @@ public abstract class OrderByTestImplementation {
             fail("<IDIndexPf1> was expected but found "
                 + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -314,7 +314,7 @@ public abstract class OrderByTestImplementation {
           limit = Integer.parseInt(queries[i].substring(indexLimit+5).trim());
         }
         assertTrue(!limitQuery || rcw.size() <= limit);
-        //assertEquals("Set",rcw.getCollectionType().getSimpleClassName());
+        //assertIndexDetailsEquals("Set",rcw.getCollectionType().getSimpleClassName());
         String colType = rcw.getCollectionType().getSimpleClassName();
         if (!(colType.equals("Ordered") || colType.equals("LinkedHashSet"))) {
           fail("The collection type " + colType + " is not expexted");
@@ -329,7 +329,7 @@ public abstract class OrderByTestImplementation {
             fail("<IDIndexPf1> was expected but found "
                 + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -429,7 +429,7 @@ public abstract class OrderByTestImplementation {
             fail("<IDIndexPf1> was expected but found "
                 + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -512,7 +512,7 @@ public abstract class OrderByTestImplementation {
             fail("<IDIndexPf1> was expected but found "
                 + itr.next().toString());
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -615,7 +615,7 @@ public abstract class OrderByTestImplementation {
             fail("<IDIndexPf1> was expected but found "
                 + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -699,7 +699,7 @@ public abstract class OrderByTestImplementation {
             fail("<IDIndexPf1> was expected but found "
                 + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();
@@ -783,7 +783,7 @@ public abstract class OrderByTestImplementation {
             fail("<PKIDIndexPf1> was expected but found "
                 + indexUsed);
           }
-          // assertEquals("statusIndexPf1",itr.next().toString());
+          // assertIndexDetailsEquals("statusIndexPf1",itr.next().toString());
         }
 
         int indxs = observer.indexesUsed.size();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/PdxOrderByJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/PdxOrderByJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/PdxOrderByJUnitTest.java
index a1cbff4..2f0327c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/PdxOrderByJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/PdxOrderByJUnitTest.java
@@ -306,7 +306,7 @@ public class PdxOrderByJUnitTest {
           if (p1 instanceof Struct) {
             Object[] values1 = ((Struct) p1).getFieldValues();
             Object[] values2 = ((Struct) p2).getFieldValues();
-            // test.assertEquals(values1.length, values2.length);
+            // test.assertIndexDetailsEquals(values1.length, values2.length);
             if (values1.length != values2.length) {
               ok = false;
               break ;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index fc793bf..c7d83b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -16,13 +16,14 @@
  */
 package com.gemstone.gemfire.cache.query.internal;
 
+import static org.junit.Assert.*;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.jmock.Mockery;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -45,20 +46,19 @@ import com.gemstone.gemfire.cache.query.internal.aggregate.SumDistinctPRQueryNod
 import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-/**
- * 
- *
- */
 @Category(UnitTest.class)
-public class CompiledAggregateFunctionJUnitTest extends TestCase {
+public class CompiledAggregateFunctionJUnitTest {
   
-  Mockery context = new Mockery();
-  private Cache cache = context.mock(Cache.class) ; 
-  private List bucketList = new ArrayList();
+  private Mockery context;
+  private Cache cache;
+  private List bucketList;
   
-  public CompiledAggregateFunctionJUnitTest(String testName) {
-    super(testName);
-    bucketList.add(Integer.valueOf(1)); 
+  @Before
+  public void setUp() throws Exception {
+    context = new Mockery();
+    cache = context.mock(Cache.class);
+    bucketList = new ArrayList();
+    bucketList.add(Integer.valueOf(1));
   }
 
   @Test
@@ -194,6 +194,4 @@ public class CompiledAggregateFunctionJUnitTest extends TestCase {
     MaxMin maxMin1 = (MaxMin) agg1;
     assertFalse(((Boolean) findMax.get(maxMin1)).booleanValue());
   }
-
-  
 }


Mime
View raw message