geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [7/7] incubator-geode git commit: Change AssertionFailedError to AssertionError and general cleanup.
Date Thu, 02 Jun 2016 05:16:27 GMT
Change AssertionFailedError to AssertionError and general cleanup.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bb91dedc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bb91dedc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bb91dedc

Branch: refs/heads/feature/GEODE-837
Commit: bb91dedc474aad8b7dee7d08df7cdf299973c4bd
Parents: 243a5c7
Author: Kirk Lund <klund@apache.org>
Authored: Wed Jun 1 21:55:23 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Wed Jun 1 21:55:23 2016 -0700

----------------------------------------------------------------------
 .../query/functional/NestedQueryJUnitTest.java  |   88 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   25 +-
 .../cache30/ClientServerCCEDUnitTest.java       |   43 +-
 .../DistributedNoAckRegionDUnitTest.java        |    2 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |   25 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  | 1148 ++++++++----------
 .../cache30/RolePerformanceDUnitTest.java       |   18 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   27 +-
 .../DistributedLockServiceDUnitTest.java        |   89 +-
 .../gemfire/internal/SSLConfigJUnitTest.java    |   58 +-
 .../Bug34179TooManyFilesOpenJUnitTest.java      |   77 +-
 .../cache/ComplexDiskRegionJUnitTest.java       |   34 +-
 ...entFlushingAndRegionOperationsJUnitTest.java |   38 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |   55 +-
 .../ConcurrentRegionOperationsJUnitTest.java    |   10 +-
 ...rentRollingAndRegionOperationsJUnitTest.java |   28 +-
 .../internal/cache/ConflationJUnitTest.java     |  159 +--
 ...iskRandomOperationsAndRecoveryJUnitTest.java |   38 +-
 .../DiskRegCachexmlGeneratorJUnitTest.java      |  121 +-
 .../internal/cache/DiskRegCbkChkJUnitTest.java  |   38 +-
 .../DiskRegOplogSwtchingAndRollerJUnitTest.java |  130 +-
 .../cache/DiskRegRecoveryJUnitTest.java         |  215 ++--
 .../cache/DiskRegionAsyncRecoveryJUnitTest.java |   14 +-
 ...RegionChangingRegionAttributesJUnitTest.java |   51 +-
 .../internal/cache/DiskRegionJUnitTest.java     |  927 ++++++--------
 .../internal/cache/DiskRegionTestingBase.java   |  126 +-
 .../internal/cache/FaultingInJUnitTest.java     |   77 +-
 .../MultipleOplogsRollingFeatureJUnitTest.java  |   41 +-
 .../gemfire/internal/cache/OplogJUnitTest.java  |    8 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |   16 +-
 ...skRegOverflowAsyncGetInMemPerfJUnitTest.java |   40 +-
 ...iskRegOverflowAsyncJUnitPerformanceTest.java |   55 +-
 ...lowSyncGetInMemPerfJUnitPerformanceTest.java |   53 +-
 ...DiskRegOverflowSyncJUnitPerformanceTest.java |   65 +-
 ...egionOverflowAsyncRollingOpLogJUnitTest.java |   13 +-
 ...RegionOverflowSyncRollingOpLogJUnitTest.java |   14 +-
 .../DiskRegionPerfJUnitPerformanceTest.java     |   78 +-
 .../DiskRegionPersistOnlySyncJUnitTest.java     |   34 +-
 ...DiskRegionRollOpLogJUnitPerformanceTest.java |   90 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |  458 +++----
 .../tier/sockets/InterestListDUnitTest.java     |  530 ++++----
 .../management/ClientHealthStatsDUnitTest.java  |   89 +-
 .../gemfire/management/ManagementTestBase.java  |   50 +-
 .../gemfire/pdx/VersionClassLoader.java         |   98 --
 .../internal/LuceneEventListenerJUnitTest.java  |    7 +-
 45 files changed, 2050 insertions(+), 3350 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb91dedc/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java
index 11dcb0e..c7ed9d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NestedQueryJUnitTest.java
@@ -22,23 +22,20 @@
  */
 package com.gemstone.gemfire.cache.query.functional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-import junit.framework.AssertionFailedError;
-
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.ErrorCollector;
 
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.query.CacheUtils;
@@ -53,29 +50,28 @@ import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
 import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
 import com.gemstone.gemfire.cache.query.internal.StructImpl;
 import com.gemstone.gemfire.cache.query.types.ObjectType;
-//import com.gemstone.gemfire.internal.util.DebuggerSupport;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-/**
- *
- */
 @Category(IntegrationTest.class)
 public class NestedQueryJUnitTest {
-  ObjectType resType1=null;
-  ObjectType resType2= null;
 
-  int resSize1=0;
-  int resSize2=0;
+  private ObjectType resType1=null;
+  private ObjectType resType2= null;
+
+  private int resSize1=0;
+  private int resSize2=0;
 
-  Iterator itert1=null;
-  Iterator itert2=null;
+  private Iterator itert1=null;
+  private Iterator itert2=null;
 
-  Set set1=null;
-  Set set2=null;
+  private Set set1=null;
+  private Set set2=null;
 
-  String s1;
-  String s2;
+  private String s1;
+  private String s2;
 
+  @Rule
+  public ErrorCollector errorCollector = new ErrorCollector(); // used by testQueries
 
   @Before
   public void setUp() throws java.lang.Exception {
@@ -90,7 +86,9 @@ public class NestedQueryJUnitTest {
     CacheUtils.closeCache();
   }
 
-  public void atestQueries() throws Exception{
+  @Ignore("TODO: this test was disabled")
+  @Test
+  public void testQueries2() throws Exception{
     String queryString;
     Query query;
     Object result;
@@ -119,14 +117,14 @@ public class NestedQueryJUnitTest {
     query = CacheUtils.getQueryService().newQuery(queryString);
     result = query.execute();
     CacheUtils.log(Utils.printResult(result));
-
   }
+
   @Test
   public void testQueries() throws Exception {
     String queries[]={
         "SELECT DISTINCT * FROM /Portfolios WHERE NOT(SELECT DISTINCT * FROM positions.values
p WHERE p.secId = 'IBM').isEmpty",
         "SELECT DISTINCT * FROM /Portfolios where NOT(SELECT DISTINCT * FROM /Portfolios
p where p.ID = 0).isEmpty",
-        "SELECT DISTINCT * FROM /Portfolios where status = ELEMENT(SELECT DISTINCT * FROM
/Portfolios p where ID = 0).status",
+        "SELECT DISTINCT * FROM /Portfolios where status = ELEMENT(SELECT DISTINCT * FROM
/Portfolios p where p.ID = 0).status",
         "SELECT DISTINCT * FROM /Portfolios where status = ELEMENT(SELECT DISTINCT * FROM
/Portfolios p where p.ID = 0).status",
         "SELECT DISTINCT * FROM /Portfolios x where status = ELEMENT(SELECT DISTINCT * FROM
/Portfolios p where x.ID = p.ID).status",
         "SELECT DISTINCT * FROM /Portfolios x where status = ELEMENT(SELECT DISTINCT * FROM
/Portfolios p where p.ID = x.ID).status",
@@ -136,19 +134,14 @@ public class NestedQueryJUnitTest {
       try{
         Query query = CacheUtils.getQueryService().newQuery(queries[i]);
         query.execute();
-        //CacheUtils.log(Utils.printResult(result));
-        CacheUtils.log("OK "+queries[i]);
       }catch(Exception e){
-        CacheUtils.log("FAILED "+queries[i]);
-        CacheUtils.log(e.getMessage());
-        //e.printStackTrace();
+        errorCollector.addError(e);
       }
     }
   }
+
   @Test
   public void testNestedQueriesEvaluation() throws Exception {
-
-
     QueryService qs;
     qs = CacheUtils.getQueryService();
     String queries[] = {
@@ -187,8 +180,7 @@ public class NestedQueryJUnitTest {
         // Iterator iter=set1.iterator();
 
       } catch (Exception e) {
-        e.printStackTrace();
-        fail(q.getQueryString());
+        throw new AssertionError(q.getQueryString(), e);
       }
     }
 
@@ -220,8 +212,7 @@ public class NestedQueryJUnitTest {
         set2=((r[i][1]).asSet());
 
       } catch (Exception e) {
-        e.printStackTrace();
-        fail(q.getQueryString());
+        throw new AssertionError(q.getQueryString(), e);
       }
     }
     for(int j=0;j<=1;j++){
@@ -246,12 +237,10 @@ public class NestedQueryJUnitTest {
         fail("FAILED: In both the Cases the members of ResultsSet are different.");
     }
     CacheUtils.compareResultsOfWithAndWithoutIndex(r, this);
-
   }
 
   @Test
-  public void testNestedQueriesResultsasStructSet() throws Exception {
-
+  public void testNestedQueriesResultsAsStructSet() throws Exception {
     QueryService qs;
     qs = CacheUtils.getQueryService();
     String queries[] = {
@@ -309,9 +298,7 @@ public class NestedQueryJUnitTest {
         // Iterator iter=set1.iterator();
 
       } catch (Exception e) {
-        AssertionFailedError afe = new AssertionFailedError(q.getQueryString());
-        afe.initCause(e);
-        throw afe;
+        throw new AssertionError(e);
       }
     }
 
@@ -336,8 +323,7 @@ public class NestedQueryJUnitTest {
         set2=((r[i][1]).asSet());
 
       } catch (Exception e) {
-        e.printStackTrace();
-        fail(q.getQueryString());
+        throw new AssertionError(q.getQueryString(), e);
       }
     }
     for(int j=0;j<queries.length;j++){
@@ -436,7 +422,6 @@ public class NestedQueryJUnitTest {
    * Tests a nested query with shorts converted to integer types in the result 
    * set of the inner query.  The short field in the outer query should be 
    * evaluated against the integer types and match.
-   * @throws Exception
    */
   @Test
   public void testNestedQueryWithShortTypesFromInnerQuery() throws Exception {
@@ -456,8 +441,6 @@ public class NestedQueryJUnitTest {
   /**
    * Tests a nested query that has duplicate results in the inner query
    * Results should not be duplicated in the final result set
-   * 
-   * @throws Exception
    */
   @Test
   public void testNestedQueryWithMultipleMatchingResultsWithIn() throws Exception {
@@ -474,10 +457,8 @@ public class NestedQueryJUnitTest {
     helpTestIndexForQuery("<trace>SELECT * FROM /portfolios1 p where p.ID in (SELECT
p.ID FROM /portfolios1 p WHERE p.ID = 1)", "p.ID", "/portfolios1 p");
   }
 
-  /*
+  /**
    * helper method to test against a compact range index
-   * @param query
-   * @throws Exception
    */
   private void helpTestIndexForQuery(String query, String indexedExpression, String regionPath)
throws Exception {
     QueryService qs = CacheUtils.getQueryService();
@@ -492,14 +473,17 @@ public class NestedQueryJUnitTest {
     assertTrue(observer.isIndexesUsed);
   }
 
-  class QueryObserverImpl extends QueryObserverAdapter{
-    boolean isIndexesUsed = false;
-    ArrayList indexesUsed = new ArrayList();
+  private static class QueryObserverImpl extends QueryObserverAdapter {
+
+    private boolean isIndexesUsed = false;
+    private ArrayList indexesUsed = new ArrayList();
 
+    @Override
     public void beforeIndexLookup(Index index, int oper, Object key) {
       indexesUsed.add(index.getName());
     }
 
+    @Override
     public void afterIndexLookup(Collection results) {
       if(results != null){
         isIndexesUsed = true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb91dedc/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
index feafcef..9961746 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
@@ -16,30 +16,18 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Properties;
 
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import junit.framework.AssertionFailedError;
-
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.xml.sax.SAXException;
 
-import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.CacheListener;
@@ -57,21 +45,18 @@ import com.gemstone.gemfire.cache.LoaderHelper;
 import com.gemstone.gemfire.cache.MirrorType;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.util.ObjectSizer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.DiskWriteAttributesImpl;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlParser;
-import com.gemstone.gemfire.internal.cache.xmlcache.ClientCacheCreation;
 import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2;
 import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
 import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.util.test.TestUtil;
 
 /**
@@ -614,7 +599,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
     File dir = null;
     try {
       dir = findFile(dirName);
-    } catch(AssertionFailedError e) {
+    } catch(AssertionError e) {
       //ignore, no directory.
     }
     if (dir != null && dir.exists()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb91dedc/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index 1829454..3a00ff4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -15,26 +15,19 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.cache30;
-
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Collection;
-import java.util.HashMap;
 
-import junit.framework.AssertionFailedError;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.DataPolicy;
@@ -48,8 +41,6 @@ import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.RegionEntry;
-import com.gemstone.gemfire.internal.cache.TombstoneService;
 import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
@@ -62,13 +53,15 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * concurrency-control tests for client/server
  * 
  *
  */
-@Category(DistributedTest.class)
+@Category(DistributedTest.class)
 public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
   public static LocalRegion TestRegion;
   
@@ -87,17 +80,17 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
     super();
   }
 
-  @Test
+  @Test
   public void testClientServerRRTombstoneGC() {
     clientServerTombstoneGCTest(getUniqueName(), true);
   }
   
-  @Test
+  @Test
   public void testClientServerPRTombstoneGC() {
     clientServerTombstoneGCTest(getUniqueName(), false);
   }
   
-  @Test
+  @Test
   public void testPutAllInNonCCEClient() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -144,12 +137,12 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
    * registerInterest() to protect the client cache from stray putAll
    * events sitting in backup queues on the server 
    */
-  @Test
+  @Test
   public void testClientRIGetsTombstonesRR() throws Exception {
     clientRIGetsTombstoneTest(getUniqueName(),true);
   }
   
-  @Test
+  @Test
   public void testClientRIGetsTombstonesPR() throws Exception {
     clientRIGetsTombstoneTest(getUniqueName(),false);
   }
@@ -202,12 +195,12 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
     ensureAllTombstonesPresent(vm2);
   }
   
-  @Test
+  @Test
   public void testClientRIGetsInvalidEntriesRR() throws Exception {
     clientRIGetsInvalidEntriesTest(getUniqueName(),true);
   }
   
-  @Test
+  @Test
   public void testClientRIGetsInvalidEntriesPR() throws Exception {
     clientRIGetsInvalidEntriesTest(getUniqueName(),false);
   }
@@ -373,12 +366,12 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
 
   //  private void closeCache(VM vm) {
 
-  @Test
+  @Test
   public void testClientServerRRQueueCleanup() {  // see bug #50879 if this fails
     clientServerTombstoneMessageTest(true);
   }
   
-  @Test
+  @Test
   public void testClientServerPRQueueCleanup() {  // see bug #50879 if this fails
     clientServerTombstoneMessageTest(false);
   }
@@ -569,7 +562,7 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
         if (TestRegion.getTombstoneCount() == 0) {
           LogWriterUtils.getLogWriter().warning("region has no tombstones");
 //          TestRegion.dumpBackingMap();
-          throw new AssertionFailedError("expected to find tombstones but region is empty");
+          throw new AssertionError("expected to find tombstones but region is empty");
         }
         return null;
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb91dedc/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
index 578c257..5f8b0c0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
@@ -294,7 +294,7 @@ public class DistributedNoAckRegionDUnitTest extends MultiVMRegionTestCase
{
 
   /**
    * The number of milliseconds to try repeating validation code in the
-   * event that AssertionFailedError is thrown.  For DISTRIBUTED_NO_ACK 
+   * event that AssertionError is thrown.  For DISTRIBUTED_NO_ACK
    * scopes, a repeat timeout is used to account for the fact that a
    * previous operation may have not yet completed.
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb91dedc/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index c225c04..05ebb44 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -16,17 +16,11 @@
  */
 package com.gemstone.gemfire.cache30;
 
+import java.util.Properties;
+
 import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
 import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
-import java.util.Properties;
+import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.RegionAttributes;
@@ -34,20 +28,17 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * Tests Global Region with OffHeap memory.
  * 
  * @since 9.0
  */
-@SuppressWarnings({ "deprecation", "serial" })
 @Category(DistributedTest.class)
+@SuppressWarnings({ "deprecation", "serial", "rawtypes", "unchecked" })
 public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
 
-  public GlobalRegionOffHeapDUnitTest() {
-    super();
-  }
-  
   @Override
   public final void preTearDownAssertions() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
@@ -64,9 +55,9 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest
{
   }
 
   @Override
-  @Ignore("DISABLED - bug 47951")
+  @Ignore("TODO: DISABLED due to bug 47951")
   @Test
-  public void testNBRegionInvalidationDuringGetInitialImage() throws Throwable {
+  public void testNBRegionInvalidationDuringGetInitialImage() throws Exception {
     //DISABLED - bug 47951
   }
 
@@ -77,7 +68,6 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest
{
     return props;
   }
   
-  @SuppressWarnings({ "rawtypes", "unchecked" })
   @Override
   protected RegionAttributes getRegionAttributes() {
     RegionAttributes attrs = super.getRegionAttributes();
@@ -86,7 +76,6 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest
{
     return factory.create();
   }
   
-  @SuppressWarnings({ "rawtypes", "unchecked" })
   @Override
   protected RegionAttributes getRegionAttributes(String type) {
     RegionAttributes ra = super.getRegionAttributes(type);


Mime
View raw message