geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [2/4] geode git commit: GEODE-2738: Corrected misspellibng of "occured" to "occurred"
Date Mon, 08 May 2017 22:22:31 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
index 2e2ea7c..a1860b3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
@@ -322,8 +322,8 @@ public class DeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
     VM0.invoke(() -> DeltaPropagationDUnitTest.createDelta());
     VM0.invoke(() -> DeltaPropagationDUnitTest.createAnEntry());
     Thread.sleep(5000); // TODO: Find a better 'n reliable alternative
-    // assert overflow occured on client vm
-    verifyOverflowOccured(1L, 2);
+    // assert overflow occurred on client vm
+    verifyOverflowOccurred(1L, 2);
     VM0.invoke(() -> DeltaPropagationDUnitTest.updateDelta());
 
     waitForLastKey();
@@ -359,8 +359,8 @@ public class DeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
     VM0.invoke(() -> DeltaPropagationDUnitTest.createDelta());
     VM0.invoke(() -> DeltaPropagationDUnitTest.createAnEntry());
     Thread.sleep(5000); // TODO: Find a better 'n reliable alternative
-    // assert overflow occured on client vm
-    verifyOverflowOccured(1L, 1);
+    // assert overflow occurred on client vm
+    verifyOverflowOccurred(1L, 1);
     VM0.invoke(() -> DeltaPropagationDUnitTest.updateDelta());
 
     waitForLastKey();
@@ -1037,7 +1037,7 @@ public class DeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
     }
   }
 
-  public static void verifyOverflowOccured(long evictions, int regionsize) {
+  public static void verifyOverflowOccurred(long evictions, int regionsize) {
     EnableLRU cc =
         ((VMLRURegionMap) ((LocalRegion) cache.getRegion(regionName)).entries)._getCCHelper();
     Assert.assertTrue(cc.getStats().getEvictions() == evictions,

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
index b91d294..f26332f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
@@ -45,7 +45,7 @@ public class DiskLruRegRecoveryJUnitTest extends DiskRegionTestingBase {
           valuesInVm++;
         }
       } catch (EntryNotFoundException e) {
-        fail("Entry not found not expected but occured ");
+        fail("Entry not found not expected but occurred ");
       }
     }
     return valuesInVm;

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
index c29b3f9..1bb06d1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
@@ -861,7 +861,7 @@ public class DiskRegOplogSwtchingAndRollerJUnitTest extends DiskRegionTestingBas
    */
   @Test
   public void testDiskFullExcep() {
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
     int[] diskDirSize1 = new int[4];
     diskDirSize1[0] = 1048576;
     diskDirSize1[1] = 1048576;
@@ -894,9 +894,9 @@ public class DiskRegOplogSwtchingAndRollerJUnitTest extends DiskRegionTestingBas
       }
     } catch (DiskAccessException e) {
       logWriter.error("exception not expected", e);
-      exceptionOccured = true;
+      exceptionOccurred = true;
     }
-    if (exceptionOccured) {
+    if (exceptionOccurred) {
       fail("FAILED::DiskAccessException is Not expected here !!");
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
index dea84b5..adca541 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
@@ -542,7 +542,7 @@ public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase {
             serilizedValuesInVm++;
           }
         } catch (EntryNotFoundException e) {
-          fail("Entry not found not expected but occured ");
+          fail("Entry not found not expected but occurred ");
         }
       }
       // Test to see if values are in serialized form, when disk recovery is performed.
@@ -594,7 +594,7 @@ public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase {
         try {
           ((LocalRegion) region).getValueInVM(new Integer(i));
         } catch (EntryNotFoundException e) {
-          fail("Entry not found not expected but occured ");
+          fail("Entry not found not expected but occurred ");
         }
       }
 
@@ -603,7 +603,7 @@ public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase {
         try {
           Assert.assertTrue(((LocalRegion) region).getValueInVM(new Integer(i)) == null);
         } catch (EntryNotFoundException e) {
-          fail("Entry not found not expected but occured ");
+          fail("Entry not found not expected but occurred ");
         }
       }
       for (int i = 0; i < 1000; i++) {
@@ -611,7 +611,7 @@ public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase {
           Assert.assertTrue(
               ((LocalRegion) region).getValueOnDisk(new Integer(i)).equals(new Integer(i)));
         } catch (EntryNotFoundException e) {
-          fail("Entry not found not expected but occured ");
+          fail("Entry not found not expected but occurred ");
         }
       }
       // region.close();

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
index 705742f..3e06f58 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
@@ -40,7 +40,7 @@ public class DiskRegionIllegalCacheXMLvaluesJUnitTest {
   public void createRegion(String path) {
     DistributedSystem ds = null;
     try {
-      boolean exceptionOccured = false;
+      boolean exceptionOccurred = false;
       File dir = new File("testingDirectoryForXML");
       dir.mkdir();
       dir.deleteOnExit();
@@ -52,11 +52,11 @@ public class DiskRegionIllegalCacheXMLvaluesJUnitTest {
 
         CacheFactory.create(ds);
       } catch (IllegalArgumentException ex) {
-        exceptionOccured = true;
+        exceptionOccurred = true;
         System.out.println(
             "ExpectedStrings: Received expected IllegalArgumentException:" + ex.getMessage());
       } catch (CacheXmlException ex) {
-        exceptionOccured = true;
+        exceptionOccurred = true;
         System.out
             .println("ExpectedStrings: Received expected CacheXmlException:" + ex.getMessage());
       } catch (Exception e) {
@@ -64,7 +64,7 @@ public class DiskRegionIllegalCacheXMLvaluesJUnitTest {
         fail("test failed due to " + e);
       }
 
-      if (!exceptionOccured) {
+      if (!exceptionOccurred) {
         fail(" exception did not occur although was expected");
       }
     } finally {

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
index c3922a7..77f6e06 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
@@ -57,7 +57,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
   private static volatile boolean hasNotified = false;
   private static volatile boolean putsHaveStarted = false;
 
-  private volatile boolean exceptionOccured = false;
+  private volatile boolean exceptionOccurred = false;
   private volatile boolean finished = false;
 
   private DiskRegionProperties diskProps = new DiskRegionProperties();
@@ -98,7 +98,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
 
   @Override
   protected final void postSetUp() throws Exception {
-    this.exceptionOccured = false;
+    this.exceptionOccurred = false;
     DiskStoreImpl.SET_IGNORE_PREALLOCATE = true;
   }
 
@@ -139,17 +139,17 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
 
     assertTrue(region.get("1") == null);
 
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
     try {
       Object result = ((LocalRegion) region).getValueOnDisk("1");
       if (result == null || result.equals(Token.TOMBSTONE)) {
-        exceptionOccured = true;
+        exceptionOccurred = true;
       }
     } catch (EntryNotFoundException e) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     }
 
-    if (!exceptionOccured) {
+    if (!exceptionOccurred) {
       fail("exception did not occur although was supposed to occur");
     }
 
@@ -831,7 +831,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
         region.put("" + i, value);
       }
     } catch (DiskAccessException e) {
-      logWriter.error("Exception occured but not expected", e);
+      logWriter.error("Exception occurred but not expected", e);
       throw new AssertionError("FAILED::", e);
     }
 
@@ -841,7 +841,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     try {
       region.put("OK", value);
     } catch (DiskAccessException e) {
-      logWriter.error("Exception occured but not expected", e);
+      logWriter.error("Exception occurred but not expected", e);
       throw new AssertionError("FAILED::", e);
     }
 
@@ -884,7 +884,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
         region.put("" + i, value);
       }
     } catch (DiskAccessException e) {
-      logWriter.error("Exception occured but not expected", e);
+      logWriter.error("Exception occurred but not expected", e);
       throw new AssertionError("FAILED::", e);
     }
 
@@ -940,7 +940,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
         region.put("" + i, value);
       }
     } catch (DiskAccessException e) {
-      logWriter.error("Exception occured but not expected", e);
+      logWriter.error("Exception occurred but not expected", e);
       throw new AssertionError("FAILED::", e);
     }
 
@@ -950,7 +950,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     try {
       region.put("OK", value);
     } catch (DiskAccessException e) {
-      logWriter.error("Exception occured but not expected", e);
+      logWriter.error("Exception occurred but not expected", e);
       throw new AssertionError("FAILED::", e);
     }
 
@@ -986,7 +986,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     int[] diskSizes1 = ((LocalRegion) region).getDiskDirSizes();
 
     assertEquals(2048, diskSizes1[0]);
-    this.exceptionOccured = false;
+    this.exceptionOccurred = false;
     dskAccessExpHelperMethod(region, true/* synch mode */);
 
     // region.close(); // closes disk file which will flush all buffers
@@ -1020,7 +1020,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     int[] diskSizes1 = ((LocalRegion) region).getDiskDirSizes();
     assertEquals(diskDirSize1.length, 1);
     assertTrue("diskSizes != 2048 ", diskSizes1[0] == 2048);
-    this.exceptionOccured = false;
+    this.exceptionOccurred = false;
     this.dskAccessExpHelperMethod(region, false/* asynch mode */);
 
     // region.close(); // closes disk file which will flush all buffers
@@ -1040,7 +1040,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
             region.put("" + (synchMode ? 1 : i), value);
           }
         } catch (DiskAccessException e) {
-          logWriter.error("Exception occured but not expected", e);
+          logWriter.error("Exception occurred but not expected", e);
           testFailed = true;
           failureCause = "FAILED::" + e.toString();
           throw new AssertionError("FAILED::", e);
@@ -1072,24 +1072,25 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
         // the space. Still the put operation must succeed.
         logWriter.info("Available disk space=" + availSpace + " MINIMUM STIPULATED SPACE="
             + DiskStoreImpl.MINIMUM_DIR_SIZE);
-        exceptionOccured = false/* availSpace >= DiskStoreImpl.MINIMUM_DIR_SIZE */; // @todo I see
-                                                                                    // this test
-                                                                                    // failing here
-                                                                                    // but I don't
-                                                                                    // know what it
-                                                                                    // means. My
-                                                                                    // availSpace is
-                                                                                    // 1052
-        if (exceptionOccured) {
+        exceptionOccurred = false/* availSpace >= DiskStoreImpl.MINIMUM_DIR_SIZE */; // @todo I see
+                                                                                     // this test
+                                                                                     // failing here
+                                                                                     // but I don't
+                                                                                     // know what it
+                                                                                     // means. My
+                                                                                     // availSpace
+                                                                                     // is
+                                                                                     // 1052
+        if (exceptionOccurred) {
           fail("FAILED::Available space should be less than Minimum Directory size("
               + DiskStoreImpl.MINIMUM_DIR_SIZE
               + ") as the operation would have violated the max directory size requirement availSpace="
               + availSpace);
         } else {
-          exceptionOccured = false /* availSpace >= 0 */; // @todo I see this test failing here but
-                                                          // I don't know what it means. My
-                                                          // availSpace is 1052
-          if (exceptionOccured) {
+          exceptionOccurred = false /* availSpace >= 0 */; // @todo I see this test failing here but
+                                                           // I don't know what it means. My
+                                                           // availSpace is 1052
+          if (exceptionOccurred) {
             fail(
                 "FAILED::Available space should be less than 0 as the operation would have violated the max directory size requirement availSpace="
                     + availSpace);
@@ -1107,7 +1108,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     assertFalse(failureCause, testFailed);
     assertFalse(
         "Expected situation of max directory size violation happening and available space less than zero did not happen  ",
-        exceptionOccured); // CC jade1d failure
+        exceptionOccurred); // CC jade1d failure
 
   }
 
@@ -1257,7 +1258,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     try {
       getInvalidEnt = region.get("key1");
     } catch (Exception e) {
-      logWriter.error("Exception occured but not expected", e);
+      logWriter.error("Exception occurred but not expected", e);
       throw new AssertionError("Failed while getting invalid entry:", e);
 
     }
@@ -1537,11 +1538,11 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
       cache.getLogger().info("waiting for clear to finish");
       ThreadUtils.join(th, 30 * 1000);
     } catch (Exception ie) {
-      DiskRegionJUnitTest.this.exceptionOccured = true;
+      DiskRegionJUnitTest.this.exceptionOccurred = true;
       DiskRegionJUnitTest.this.failureCause = ie.toString();
     }
 
-    assertFalse(this.failureCause, this.exceptionOccured);
+    assertFalse(this.failureCause, this.exceptionOccurred);
     NewLRUClockHand lruList = ((VMLRURegionMap) ((LocalRegion) region).entries)._getLruList();
     assertEquals(region.size(), 0);
     lruList.audit();
@@ -1581,7 +1582,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
         // DistributedTestCase.join(th, 7 * 1000, null);
         // }
         // catch (Exception e) {
-        // DiskRegionJUnitTest.this.exceptionOccured = true;
+        // DiskRegionJUnitTest.this.exceptionOccurred = true;
         // DiskRegionJUnitTest.this.failureCause = e.toString();
         // }
       }
@@ -1589,7 +1590,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     try {
       region.clear();
       ThreadUtils.join(th, 30 * 1000);
-      assertFalse(this.failureCause, this.exceptionOccured);
+      assertFalse(this.failureCause, this.exceptionOccurred);
       // We expect 1 entry to exist, because the clear was triggered before
       // the update
       assertEquals(1, region.size());
@@ -1632,7 +1633,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
         // DistributedTestCase.join(th, 10 * 1000, null);
         // }
         // catch (Exception e) {
-        // DiskRegionJUnitTest.this.exceptionOccured = true;
+        // DiskRegionJUnitTest.this.exceptionOccurred = true;
         // DiskRegionJUnitTest.this.failureCause = e.toString();
         // }
       }
@@ -1640,7 +1641,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
     try {
       region.clear();
       ThreadUtils.join(th, 30 * 1000);
-      assertFalse(this.failureCause, this.exceptionOccured);
+      assertFalse(this.failureCause, this.exceptionOccurred);
       // We expect 1 entry to exist, because the clear was triggered before
       // the update
       assertEquals(1, region.size());

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
index cea560e..f4e20d7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
 @Category(IntegrationTest.class)
 public class MapInterface2JUnitTest {
 
-  protected boolean afterClearCallbackOccured = false;
+  protected boolean afterClearCallbackOccurred = false;
   boolean mainThreadProceed = false;
 
   @Before
@@ -115,7 +115,7 @@ public class MapInterface2JUnitTest {
       public void afterRegionClear(RegionEvent event) {
         synchronized (MapInterface2JUnitTest.this) {
           event.getRegion().getCache().getLogger().info("afterRegionClear call back " + event);
-          afterClearCallbackOccured = true;
+          afterClearCallbackOccurred = true;
           MapInterface2JUnitTest.this.notify();
         }
       }
@@ -132,14 +132,14 @@ public class MapInterface2JUnitTest {
     }
     try {
       synchronized (this) {
-        if (!this.afterClearCallbackOccured) {
+        if (!this.afterClearCallbackOccurred) {
           this.wait(10000);
         }
       }
     } catch (InterruptedException ie) {
       fail(ie.toString());
     }
-    if (!this.afterClearCallbackOccured) {
+    if (!this.afterClearCallbackOccurred) {
       fail("afterClear Callback not issued");
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
index b005c85..c8e781b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
@@ -76,13 +76,13 @@ public class MapInterfaceJUnitTest {
     } catch (Exception e) {
       throw new AssertionError(" failed in creating region due to ", e);
     }
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
     try {
       region.localClear();
     } catch (UnsupportedOperationException e) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     }
-    if (!exceptionOccured) {
+    if (!exceptionOccurred) {
       fail(" exception did not occur when it was supposed to occur");
     }
     region.close();
@@ -130,13 +130,13 @@ public class MapInterfaceJUnitTest {
     } catch (Exception e) {
       throw new AssertionError(" failed in creating region due to ", e);
     }
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
     try {
       region.localClear();
     } catch (UnsupportedOperationException e) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     }
-    if (!exceptionOccured) {
+    if (!exceptionOccurred) {
       fail(" exception did not occur when it was supposed to occur");
     }
     region.close();
@@ -195,13 +195,13 @@ public class MapInterfaceJUnitTest {
     } catch (Exception e) {
       throw new AssertionError(" failed in creating region due to ", e);
     }
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
     try {
       region.localClear();
     } catch (UnsupportedOperationException e) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     }
-    if (!exceptionOccured) {
+    if (!exceptionOccurred) {
       fail(" exception did not occur when it was supposed to occur");
     }
     region.close();

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
index 02e0a82..9d67a4f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
@@ -86,7 +86,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
 
   protected long delta;
 
-  protected boolean flushOccuredAtleastOnce = false;
+  protected boolean flushOccurredAtleastOnce = false;
 
   volatile protected boolean assertDone = false;
 
@@ -406,7 +406,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
     try {
       region.destroy(new Integer(0));
     } catch (EntryNotFoundException e1) {
-      logWriter.error("Exception occured", e1);
+      logWriter.error("Exception occurred", e1);
       fail(" Entry not found when it was expected to be there");
     }
     region.close();
@@ -420,7 +420,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
     try {
       region.destroy(new Integer(0));
     } catch (EntryNotFoundException e1) {
-      logWriter.error("Exception occured", e1);
+      logWriter.error("Exception occurred", e1);
       fail(" Entry not found when it was expected to be there");
     }
     region.close();
@@ -434,7 +434,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
     try {
       region.destroy(new Integer(0));
     } catch (EntryNotFoundException e1) {
-      logWriter.error("Exception occured", e1);
+      logWriter.error("Exception occurred", e1);
       fail(" Entry not found when it was expected to be there");
     }
     region.close();
@@ -608,7 +608,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
       assertTrue(dr.getNoBuffer(entry.getDiskId()) == Token.INVALID);
 
     } catch (Exception e) {
-      logWriter.error("Exception occured", e);
+      logWriter.error("Exception occurred", e);
       fail(e.toString());
     }
     closeDown();
@@ -759,7 +759,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // Thread.sleep(4000);
   // }
   // catch (InterruptedException ie) {
-  // logWriter.error("Exception occured", ie);
+  // logWriter.error("Exception occurred", ie);
   // failureCause = "No guarantee of vaildity of result hence failing. Exception = "
   // + ie;
   // testFailed = true;
@@ -808,7 +808,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // Thread.sleep(5000);
   // }
   // catch (InterruptedException ie) {
-  // logWriter.error("Exception occured", ie);
+  // logWriter.error("Exception occurred", ie);
   // failureCause = "No guarantee of vaildity of result hence failing. Exception = "
   // + ie;
   // testFailed = true;
@@ -901,7 +901,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // CacheObserverHolder.setInstance(old);
   // }
   // catch (Exception e) {
-  // logWriter.error("Exception occured", e);
+  // logWriter.error("Exception occurred", e);
   // fail(e.toString());
   // }
   // assertFalse(failureCause, testFailed);
@@ -1491,7 +1491,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // {
 
   // synchronized (OplogJUnitTest.this) {
-  // flushOccuredAtleastOnce = true;
+  // flushOccurredAtleastOnce = true;
   // OplogJUnitTest.this.notify();
   // }
 
@@ -1524,9 +1524,9 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // "The number of operations did not cause asynch writer to run atleast once , the expected file
   // size = "
   // + expectedSize, expectedSize > 1000);
-  // if (!flushOccuredAtleastOnce) {
+  // if (!flushOccurredAtleastOnce) {
   // synchronized (this) {
-  // if (!flushOccuredAtleastOnce) {
+  // if (!flushOccurredAtleastOnce) {
   // try {
   // this.wait(20000);
   // }
@@ -1536,7 +1536,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // }
   // }
   // }
-  // if (!flushOccuredAtleastOnce) {
+  // if (!flushOccurredAtleastOnce) {
   // fail("In the wait duration , flush did not occur even once. Try increasing the wait time");
   // }
   // long actualFileSize = 0L;
@@ -1695,7 +1695,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
       assertEquals(val_11, Token.LOCAL_INVALID);
 
     } catch (Exception e) {
-      logWriter.error("Exception occured", e);
+      logWriter.error("Exception occurred", e);
       // fail("The test failed due to exception = " + e);
       throw e;
     } finally {
@@ -1725,7 +1725,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
       byte[] val_1 = ((byte[]) ((LocalRegion) region).getValueOnDiskOrBuffer("1"));
       assertEquals(val_1.length, 0);
     } catch (Exception e) {
-      logWriter.error("Exception occured", e);
+      logWriter.error("Exception occurred", e);
       fail("The test failed due to exception = " + e);
     }
     closeDown();
@@ -1753,7 +1753,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
       byte[] val_1 = ((byte[]) ((LocalRegion) region).getValueOnDiskOrBuffer("1"));
       assertEquals(val_1.length, 0);
     } catch (Exception e) {
-      logWriter.error("Exception occured", e);
+      logWriter.error("Exception occurred", e);
       fail("The test failed due to exception = " + e);
     }
     closeDown();
@@ -1870,7 +1870,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
     try {
       region.put("key1", val);
     } catch (DiskAccessException dae) {
-      logWriter.error("Exception occured", dae);
+      logWriter.error("Exception occurred", dae);
       fail(
           "Test failed as DiskAccessException was encountered where as the operation should ideally have proceeded without issue . exception = "
               + dae);
@@ -3091,13 +3091,13 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
     int sizeOfRegion = region.size();
     region.close();
     // this variable will set to false in the src code itself
-    // NewLBHTreeDiskRegion.setJdbmexceptionOccuredToTrueForTesting = true;
+    // NewLBHTreeDiskRegion.setJdbmexceptionOccurredToTrueForTesting = true;
     try {
       region = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache, null, Scope.LOCAL);
     } catch (Exception e) {
       fail("failed in recreating region due to" + e);
     } finally {
-      // NewLBHTreeDiskRegion.setJdbmexceptionOccuredToTrueForTesting = false;
+      // NewLBHTreeDiskRegion.setJdbmexceptionOccurredToTrueForTesting = false;
     }
     if (sizeOfRegion != region.size()) {
       fail(" Expected region size to be " + sizeOfRegion + " after recovery but it is "
@@ -3240,7 +3240,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
     region = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache, diskProps, Scope.LOCAL);
     final DiskRegion dr = ((LocalRegion) region).getDiskRegion();
     final Object lock = new Object();
-    final boolean[] exceptionOccured = new boolean[] {true};
+    final boolean[] exceptionOccurred = new boolean[] {true};
     final boolean[] okToExit = new boolean[] {false};
     final boolean[] switchExpected = new boolean[] {false};
 
@@ -3301,9 +3301,9 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
             if (after != oplog_2_size) {
               cache.getLogger().info(
                   "test failed before=" + before + " after=" + after + " oplogsSize=" + oplogsSize);
-              exceptionOccured[0] = true;
+              exceptionOccurred[0] = true;
             } else {
-              exceptionOccured[0] = false;
+              exceptionOccurred[0] = false;
             }
             LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
             lock.notify();
@@ -3341,7 +3341,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
           lock.wait(9000);
           assertTrue(okToExit[0]);
         }
-        assertFalse(exceptionOccured[0]);
+        assertFalse(exceptionOccurred[0]);
       }
 
       region.close();
@@ -3373,7 +3373,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // diskProps);
   // final DiskRegion dr = ((LocalRegion)region).getDiskRegion();
   // final Object lock = new Object();
-  // final boolean [] exceptionOccured = new boolean[] {true};
+  // final boolean [] exceptionOccurred = new boolean[] {true};
   // final boolean [] okToExit = new boolean[] {false};
 
   // CacheObserver old = CacheObserverHolder
@@ -3391,7 +3391,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // synchronized(lock) {
   // okToExit[0] = true;
   // long after = dr.getNextDir().getDirStatsDiskSpaceUsage();;
-  // exceptionOccured[0] = false;
+  // exceptionOccurred[0] = false;
   // LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
   // lock.notify();
   // }
@@ -3410,7 +3410,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
   // lock.wait(9000);
   // assertTrue(okToExit[0]);
   // }
-  // assertFalse(exceptionOccured[0]);
+  // assertFalse(exceptionOccurred[0]);
   // }
   // while (region.forceCompaction() != null) {
   // // wait until no more oplogs to compact

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
index c22c68d..8a825d3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
@@ -115,7 +115,7 @@ public class PartitionedRegionDestroyDUnitTest extends PartitionedRegionDUnitTes
 
         } catch (RegionDestroyedException e) {
           // getLogWriter().info (
-          // "RegionDestroyedException occured for Region = " + PR_PREFIX + j);
+          // "RegionDestroyedException occurred for Region = " + PR_PREFIX + j);
         }
         getCache().getLogger().info(
             "<ExpectedException action=remove>" + expectedExistsException + "</ExpectedException>");
@@ -158,7 +158,7 @@ public class PartitionedRegionDestroyDUnitTest extends PartitionedRegionDUnitTes
           }
         } catch (RegionDestroyedException e) {
           LogWriterUtils.getLogWriter()
-              .info("RegionDestroyedException occured for Region = " + PR_PREFIX + j);
+              .info("RegionDestroyedException occurred for Region = " + PR_PREFIX + j);
         }
         getCache().getLogger()
             .info("<ExpectedException action=remove>" + expectedException + "</ExpectedException>");

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
index bfdf1c0..1bc45be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
@@ -322,7 +322,7 @@ public class PersistentPartitionedRegionJUnitTest {
           valuesInVm++;
         }
       } catch (EntryNotFoundException e) {
-        fail("Entry not found not expected but occured ");
+        fail("Entry not found not expected but occurred ");
       }
     }
     return valuesInVm;

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
index e7b64a7..8a5e10e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
@@ -61,7 +61,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache, diskProps);
       } catch (Exception e) {
-        logWriter.error("Exception occured", e);
+        logWriter.error("Exception occurred", e);
         fail(" Exception in createOverflowandPersist due to " + e);
       }
       region.close();
@@ -73,7 +73,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache, diskProps);
       } catch (Exception e) {
-        logWriter.error("Exception occured", e);
+        logWriter.error("Exception occurred", e);
         fail(" Exception in createOverflowOnly due to " + e);
       }
       region.close();
@@ -85,7 +85,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
       try {
         region = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache, diskProps);
       } catch (Exception e) {
-        logWriter.error("Exception occured", e);
+        logWriter.error("Exception occurred", e);
         fail(" Exception in createOverflowandPersist due to " + e);
       }
       region.close();
@@ -96,7 +96,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
     try {
       region = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache, diskProps);
     } catch (Exception e) {
-      logWriter.error("Exception occured", e);
+      logWriter.error("Exception occurred", e);
       fail(" Exception in createOverflowandPersist due to " + e);
     }
 
@@ -146,7 +146,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache, diskProps);
       } catch (Exception e) {
-        logWriter.error("Exception occured", e);
+        logWriter.error("Exception occurred", e);
         fail(" Exception in createOverflowandPersist due to " + e);
       }
       region.destroyRegion();
@@ -162,7 +162,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache, diskProps);
       } catch (Exception e) {
-        logWriter.error("Exception occured", e);
+        logWriter.error("Exception occurred", e);
         fail(" Exception in createOverflowOnly due to " + e);
       }
       region.destroyRegion();
@@ -178,7 +178,7 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
       try {
         region = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache, diskProps);
       } catch (Exception e) {
-        logWriter.error("Exception occured", e);
+        logWriter.error("Exception occurred", e);
         fail(" Exception in createOverflowandPersist due to " + e);
       }
       region.destroyRegion();

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index b00921d..9abc8f3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -430,7 +430,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
      * DataPolicy.REPLICATE ));
      * 
      * DistributedTestCase.join(async[0], 50 * 1000, getLogWriter()); if (async[0].getException() !=
-     * null) { fail("UnExpected Exception Occured : ", async[0].getException()); } List l =
+     * null) { fail("UnExpected Exception Occurred : ", async[0].getException()); } List l =
      * (List)async[0].getReturnValue();
      */
     List l = (List) empty
@@ -468,7 +468,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
 
     ThreadUtils.join(async[0], 50 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(5001, l.size());
@@ -594,7 +594,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
     emptyServer1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.closeCacheHA());
     ThreadUtils.join(async[0], 4 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(5001, l.size());
@@ -952,7 +952,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
       executeInlineFunction();
       ds.disconnect();
     } catch (Exception e) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
       e.printStackTrace();
       Assert.fail("Test failed", e);
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index 3592ec0..a2a6667 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -1071,7 +1071,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
           noOfExecutionsCompleted_Inline++;
 
         } catch (Exception e) {
-          LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+          LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
           e.printStackTrace();
           Assert.fail("Test failed", e);
         }
@@ -1144,7 +1144,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
   }
 
   /**
-   * Test the exception occured while invoking the function execution on all members of DS
+   * Test the exception occurred while invoking the function execution on all members of DS
    * 
    * Function throws the Exception, The check is added to for the no of function execution execption
    * in datatostore1
@@ -1220,7 +1220,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
         } catch (Exception expected) {
           return Boolean.TRUE;
         }
-        fail("No exception Occured");
+        fail("No exception Occurred");
         return Boolean.FALSE;
       }
     });

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 1bc00a8..d14a212 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -410,7 +410,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
       }
       ds.disconnect();
     } catch (Exception e) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
       e.printStackTrace();
       Assert.fail("Test failed", e);
     }
@@ -464,7 +464,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
         assertEquals(obj, "Success");
       }
     } catch (Exception e) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
       e.printStackTrace();
       Assert.fail("Test failed", e);
     }
@@ -501,7 +501,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
         assertTrue(obj instanceof MyFunctionExecutionException);
       }
     } catch (Exception e) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
       e.printStackTrace();
       Assert.fail("Test failed", e);
     }
@@ -599,7 +599,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
         assertEquals(obj, "Success");
       }
     } catch (Exception e) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
       e.printStackTrace();
       Assert.fail("Test failed", e);
     }
@@ -618,7 +618,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
       rc.getResult();
       fail("Test Failed");
     } catch (Exception expected) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + expected.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + expected.getMessage());
       // boolean check = expected.getMessage().equals("Cannot return any result, as
       // Function.hasResult() is false");
       assertTrue(expected.getMessage()

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index e61ce84..19d6ca8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -110,7 +110,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRCl
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 6 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());
@@ -142,7 +142,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRCl
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 5 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index ff4ca42..0755966 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -350,7 +350,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 6 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
 
@@ -383,7 +383,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 5 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());
@@ -1096,7 +1096,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
         }
       });
     } catch (Exception expected) {
-      LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage());
+      LogWriterUtils.getLogWriter().fine("Exception occurred : " + expected.getMessage());
       assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey)
           || expected.getMessage().startsWith("Server could not send the reply")
           || expected.getMessage().startsWith("Unexpected exception during"));

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index a06d7e6..c24c7ae 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -317,7 +317,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 6 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
 
@@ -361,7 +361,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 5 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());
@@ -1067,7 +1067,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
         }
       });
     } catch (Exception expected) {
-      LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage());
+      LogWriterUtils.getLogWriter().fine("Exception occurred : " + expected.getMessage());
       assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey)
           || expected.getMessage().startsWith("Server could not send the reply")
           || expected.getMessage().startsWith("Unexpected exception during"));

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index 40b653c..ba6f948 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -362,7 +362,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 6 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
 
@@ -394,7 +394,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
         .verifyDeadAndLiveServers(new Integer(1), new Integer(2)));
     ThreadUtils.join(async[0], 5 * 60 * 1000);
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());
@@ -1114,7 +1114,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
         }
       });
     } catch (Exception expected) {
-      LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage());
+      LogWriterUtils.getLogWriter().fine("Exception occurred : " + expected.getMessage());
       assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey)
           || expected.getMessage().startsWith("Server could not send the reply")
           || expected.getMessage().startsWith("Unexpected exception during"));

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index b9674dd..24ab82d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -928,7 +928,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
     ThreadUtils.join(async[0], 60 * 1000);
 
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());
@@ -1022,7 +1022,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
     ThreadUtils.join(async[0], 60 * 1000);
 
     if (async[0].getException() != null) {
-      Assert.fail("UnExpected Exception Occured : ", async[0].getException());
+      Assert.fail("UnExpected Exception Occurred : ", async[0].getException());
     }
     List l = (List) async[0].getReturnValue();
     assertEquals(2, l.size());
@@ -1475,7 +1475,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
         } catch (Exception expected) {
           // No data should cause exec to throw
-          LogWriterUtils.getLogWriter().warning("Exception Occured : " + expected.getMessage());
+          LogWriterUtils.getLogWriter().warning("Exception Occurred : " + expected.getMessage());
           // boolean expectedStr = expected.getMessage().startsWith("No target
           // node was found for routingKey");
           // assertTrue("Unexpected exception: " + expected, expectedStr);
@@ -2856,7 +2856,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
       rc.getResult();
       ds.disconnect();
     } catch (Exception e) {
-      LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage());
+      LogWriterUtils.getLogWriter().info("Exception Occurred : " + e.getMessage());
       e.printStackTrace();
       Assert.fail("Test failed", e);
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
index 7e2861f..1df574f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
@@ -252,7 +252,7 @@ public class PRPerformanceTestDUnitTest extends PartitionedRegionDUnitTestCase {
             ResultCollector rc = dataSet.execute(function.getId());
             list = (ArrayList) rc.getResult();
           } catch (Exception ex) {
-            LogWriterUtils.getLogWriter().info("Exception Occured :" + ex.getMessage());
+            LogWriterUtils.getLogWriter().info("Exception Occurred :" + ex.getMessage());
             Assert.fail("Test failed", ex);
           }
           Object val = list.get(0);

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
index b802b8e..f4b9339 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -40,7 +40,7 @@ public class BlockingHARegionJUnitTest {
   private static Cache cache = null;
 
   /** boolean to record an exception occurence in another thread **/
-  private static volatile boolean exceptionOccured = false;
+  private static volatile boolean exceptionOccurred = false;
   /** StringBuffer to store the exception **/
   private static StringBuffer exceptionString = new StringBuffer();
   /** boolen to quit the for loop **/
@@ -63,7 +63,7 @@ public class BlockingHARegionJUnitTest {
    */
   @Test
   public void testBoundedPuts() throws Exception {
-    exceptionOccured = false;
+    exceptionOccurred = false;
     HARegionQueueAttributes harqa = new HARegionQueueAttributes();
     harqa.setBlockingQueueCapacity(1);
     HARegionQueue hrq = HARegionQueue.getHARegionQueueInstance("BlockingHARegionJUnitTest_Region",
@@ -78,7 +78,7 @@ public class BlockingHARegionJUnitTest {
     ThreadUtils.join(thread1, 30 * 1000);
     ThreadUtils.join(thread2, 30 * 1000);
 
-    if (exceptionOccured) {
+    if (exceptionOccurred) {
       fail(" Test failed due to " + exceptionString);
     }
 
@@ -95,7 +95,7 @@ public class BlockingHARegionJUnitTest {
    */
   @Test
   public void testPutBeingBlocked() throws Exception {
-    exceptionOccured = false;
+    exceptionOccurred = false;
     quitForLoop = false;
     HARegionQueueAttributes harqa = new HARegionQueueAttributes();
     harqa.setBlockingQueueCapacity(1);
@@ -144,7 +144,7 @@ public class BlockingHARegionJUnitTest {
 
     ThreadUtils.join(thread1, 30 * 1000); // for completeness
     ThreadUtils.join(thread2, 30 * 1000);
-    if (exceptionOccured) {
+    if (exceptionOccurred) {
       fail(" Test failed due to " + exceptionString);
     }
     cache.close();
@@ -160,7 +160,7 @@ public class BlockingHARegionJUnitTest {
    */
   @Test
   public void testConcurrentPutsNotExceedingLimit() throws Exception {
-    exceptionOccured = false;
+    exceptionOccurred = false;
     quitForLoop = false;
     HARegionQueueAttributes harqa = new HARegionQueueAttributes();
     harqa.setBlockingQueueCapacity(10000);
@@ -228,7 +228,7 @@ public class BlockingHARegionJUnitTest {
   @Ignore("TODO: test is disabled")
   @Test
   public void testConcurrentPutsTakesNotExceedingLimit() throws Exception {
-    exceptionOccured = false;
+    exceptionOccurred = false;
     quitForLoop = false;
     HARegionQueueAttributes harqa = new HARegionQueueAttributes();
     harqa.setBlockingQueueCapacity(10000);
@@ -315,7 +315,7 @@ public class BlockingHARegionJUnitTest {
   @Test
   public void testHARQMaxCapacity_Bug37627() throws Exception {
     try {
-      exceptionOccured = false;
+      exceptionOccurred = false;
       quitForLoop = false;
       HARegionQueueAttributes harqa = new HARegionQueueAttributes();
       harqa.setBlockingQueueCapacity(1);
@@ -335,13 +335,13 @@ public class BlockingHARegionJUnitTest {
             hrq.put(new ConflatableObject("key3", "value1", id2, false, "region1"));
           } catch (Exception e) {
             exceptionString.append("First Put in region queue failed");
-            exceptionOccured = true;
+            exceptionOccurred = true;
           }
         }
       };
       t1.start();
       ThreadUtils.join(t1, 20 * 1000);
-      if (exceptionOccured) {
+      if (exceptionOccurred) {
         fail(" Test failed due to " + exceptionString);
       }
     } finally {
@@ -388,8 +388,8 @@ public class BlockingHARegionJUnitTest {
             break;
           }
         } catch (Exception e) {
-          exceptionOccured = true;
-          exceptionString.append(" Exception occured due to " + e);
+          exceptionOccurred = true;
+          exceptionString.append(" Exception occurred due to " + e);
         }
       }
     }
@@ -414,8 +414,8 @@ public class BlockingHARegionJUnitTest {
         try {
           assertNotNull(this.regionQueue.take());
         } catch (Exception e) {
-          exceptionOccured = true;
-          exceptionString.append(" Exception occured due to " + e);
+          exceptionOccurred = true;
+          exceptionString.append(" Exception occurred due to " + e);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
index 125fb81..39aa1e6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
@@ -136,7 +136,7 @@ public class BlockingHARegionQueueJUnitTest extends HARegionQueueJUnitTest {
     assertNotNull(conf);
     hrq.remove();
     Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !t1.isAlive());
-    assertFalse("Exception occured in put-thread", encounteredException);
+    assertFalse("Exception occurred in put-thread", encounteredException);
 
   }
 
@@ -174,6 +174,6 @@ public class BlockingHARegionQueueJUnitTest extends HARegionQueueJUnitTest {
     waitAtLeast(1000, start, () -> {
       assertFalse("Put-thread blocked unexpectedly", t1.isAlive());
     });
-    assertFalse("Exception occured in put-thread", encounteredException);
+    assertFalse("Exception occurred in put-thread", encounteredException);
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 081514d..4fb851f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -220,7 +220,7 @@ public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
   }
 
   /**
-   * Waits for the listener to receive all events and validates that no exception occured in client
+   * Waits for the listener to receive all events and validates that no exception occurred in client
    */
   private static void validateEventCountAtClient() throws Exception {
     if (!proceedForValidation) {

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
index a2b6249..e4db6b1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -401,7 +401,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
   }
 
   /**
-   * Waits for the listener to receive all events and validates that no exception occured in client
+   * Waits for the listener to receive all events and validates that no exception occurred in client
    */
   public static void verifyEventIdsOnClient2() {
     if (!proceedForValidation) {

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
index 14be90e..063c529 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -300,7 +300,7 @@ public class HARegionQueueDUnitTest extends JUnit4DistributedTestCase {
         hrq.getRegion().localDestroy(iterator.next());
       }
     } catch (Exception e) {
-      fail("Exception occured while trying to destroy region", e);
+      fail("Exception occurred while trying to destroy region", e);
     }
 
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
index 30386ba..88b8dd1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -582,7 +582,7 @@ public class HARegionQueueJUnitTest {
           !(regionqueue.getEventsMapForTesting().size() == 0));
 
     } catch (Exception e) {
-      throw new AssertionError("Exception occured in test due to ", e);
+      throw new AssertionError("Exception occurred in test due to ", e);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
index 3445b33..c85f875 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
@@ -74,7 +74,7 @@ public class HARegionQueueStartStopJUnitTest {
   @Test
   public void testStartStop() {
     try {
-      boolean exceptionOccured = false;
+      boolean exceptionOccurred = false;
       Cache cache = createCache();
       createHARegionQueue("test", cache);
       Assert.assertTrue(HARegionQueue.getDispatchedMessagesMapForTesting() != null);
@@ -82,9 +82,9 @@ public class HARegionQueueStartStopJUnitTest {
       try {
         HARegionQueue.getDispatchedMessagesMapForTesting();
       } catch (NullPointerException e) {
-        exceptionOccured = true;
+        exceptionOccurred = true;
       }
-      if (!exceptionOccured) {
+      if (!exceptionOccurred) {
         fail("Expected exception to occur but did not occur");
       }
       HARegionQueue.startHAServices((GemFireCacheImpl) cache);
@@ -93,9 +93,9 @@ public class HARegionQueueStartStopJUnitTest {
       try {
         HARegionQueue.getDispatchedMessagesMapForTesting();
       } catch (NullPointerException e) {
-        exceptionOccured = true;
+        exceptionOccurred = true;
       }
-      if (!exceptionOccured) {
+      if (!exceptionOccurred) {
         fail("Expected exception to occur but did not occur");
       }
 
@@ -104,9 +104,9 @@ public class HARegionQueueStartStopJUnitTest {
       try {
         HARegionQueue.getDispatchedMessagesMapForTesting();
       } catch (NullPointerException e) {
-        exceptionOccured = true;
+        exceptionOccurred = true;
       }
-      if (!exceptionOccured) {
+      if (!exceptionOccurred) {
         fail("Expected exception to occur but did not occur");
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index 346fe23..9d0892a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -355,7 +355,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
     setClientServerObserverForBeforeInterestRecoveryFailure();
     primary.invoke(() -> HAInterestTestCase.startServer());
     waitForBeforeInterestRecoveryCallBack();
-    if (exceptionOccured) {
+    if (exceptionOccurred) {
       fail("The DSM could not ensure that server 1 is started & serevr 2 is stopped");
     }
     final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
index 544f732..858f603 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -94,7 +94,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
   protected static VM server2 = null;
   protected static VM server3 = null;
 
-  protected volatile static boolean exceptionOccured = false;
+  protected volatile static boolean exceptionOccurred = false;
 
   @Override
   public final void postSetUp() throws Exception {
@@ -107,7 +107,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
     PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCache())).intValue();
     PORT2 = ((Integer) server2.invoke(() -> HAInterestTestCase.createServerCache())).intValue();
     PORT3 = ((Integer) server3.invoke(() -> HAInterestTestCase.createServerCache())).intValue();
-    exceptionOccured = false;
+    exceptionOccurred = false;
     IgnoredException.addIgnoredException("java.net.ConnectException: Connection refused: connect");
   }
 
@@ -317,7 +317,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
           try {
             ThreadUtils.join(t, 30 * 1000);
           } catch (Exception ignore) {
-            exceptionOccured = true;
+            exceptionOccurred = true;
           }
           HAInterestTestCase.isBeforeInterestRecoveryCallbackCalled = true;
           HAInterestTestCase.class.notify();

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
index d8164f1..ab21f53 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -273,7 +273,7 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
   /**
    * one server two clients create Entries in all the vms server directly puts some values then both
    * clients connect to the server c1 register(k1,k2,k3) and c2 register (k4,k5) then verify that
-   * updates has occured as a result of interest registration.
+   * updates has occurred as a result of interest registration.
    */
   @Test
   public void testInitializationOfRegionFromInterestList() throws Exception {

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 0786ef7..857bab3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -273,74 +273,74 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
     for (int i = 0; i < totalKeys; i++) {
       keylist.add("key-" + i);
     }
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
 
     // test registerInterest(key)
     try {
       region1.registerInterest("DummyKey1");
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail("UnsupportedOperationException was not thrown as expected for registerInterest(key)");
     }
 
     // test registerInterest(key,policy)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.registerInterest("DummyKey2", policy);
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for  registerInterest(key,policy)");
     }
 
     // test registerInterest(keylist)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.registerInterest(keylist);
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for registerInterest(keylist)");
     }
 
     // test registerInterest(keylist,policy)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.registerInterest(keylist, policy);
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for registerInterest(keylist,policy)");
     }
 
     // test registerInterestRegex(expr)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.registerInterestRegex("ke?");
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for registerInterestRegex(expr)");
     }
 
     // test registerInterestRegex(expr,policy)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.registerInterestRegex("ke?", InterestResultPolicy.KEYS_VALUES);
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for registerInterestRegex(expr,policy)");
     }
@@ -363,37 +363,37 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
     }
 
     // test unregisterInterest(key)
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
     try {
       region1.unregisterInterest("DummyKey1");
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for unregisterInterest(key)");
     }
 
     // test unregisterInterest(keylist)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.unregisterInterest(keylist);
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for unregisterInterest(keylist)");
     }
 
     // test unregisterInterestRegex(expr)
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.unregisterInterestRegex("kp?");
     } catch (UnsupportedOperationException expected) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail(
             "UnsupportedOperationException was not thrown as expected for unregisterInterestRegex(expr)");
     }
@@ -409,27 +409,27 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
    */
   public static void getInterestForRegion() {
     Region region1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
-    boolean exceptionOccured = false;
+    boolean exceptionOccurred = false;
 
     // test getInterestList()
     try {
       region1.getInterestList();
     } catch (UnsupportedOperationException e) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail("UnsupportedOperationException was not thrown as expected for getInterestList()");
     }
 
     // test getInterestListRegex()
 
-    exceptionOccured = false;
+    exceptionOccurred = false;
     try {
       region1.getInterestListRegex();
     } catch (UnsupportedOperationException e) {
-      exceptionOccured = true;
+      exceptionOccurred = true;
     } finally {
-      if (!exceptionOccured)
+      if (!exceptionOccurred)
         fail("UnsupportedOperationException was not thrown as expected for getInterestListRegex()");
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
index 1a5447b..826691d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
@@ -73,7 +73,7 @@ public class CleanUpJUnitTest {
         fail(
             "DataSourceFactoryTest-testGetSimpleDataSource() Error in creating the GemFireBasicDataSource");
     } catch (Exception e) {
-      fail("Exception occured in testGetSimpleDataSource due to " + e);
+      fail("Exception occurred in testGetSimpleDataSource due to " + e);
       e.printStackTrace();
     }
   }
@@ -104,7 +104,7 @@ public class CleanUpJUnitTest {
         fail("Clean-up on expiration not done");
       }
     } catch (Exception e) {
-      fail("Exception occured in testBlockingTimeOut due to " + e);
+      fail("Exception occurred in testBlockingTimeOut due to " + e);
       e.printStackTrace();
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
index 9a0916a..f8fa5a7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
@@ -67,7 +67,7 @@ public class ConnectionPoolCacheImplJUnitTest {
       ds1 = DistributedSystem.connect(props);
       cache = CacheFactory.create(ds1);
     } catch (Exception e) {
-      fail("Exception occured in creation of ds and cache due to " + e);
+      fail("Exception occurred in creation of ds and cache due to " + e);
       e.printStackTrace();
     }
   }
@@ -97,7 +97,7 @@ public class ConnectionPoolCacheImplJUnitTest {
       ThreadB = new Thread(clientB, "ThreadB");
       ThreadA.start();
     } catch (Exception e) {
-      fail("Exception occured in testConnectionPoolFunctions due to " + e);
+      fail("Exception occurred in testConnectionPoolFunctions due to " + e);
       e.printStackTrace();
     }
   }
@@ -128,7 +128,7 @@ public class ConnectionPoolCacheImplJUnitTest {
           // System.out.println(" Got connection " + numConn + "from "+
           // threadName);
         } catch (Exception ex) {
-          fail("Exception occured in trying to getPooledConnectionfromPool due to " + ex);
+          fail("Exception occurred in trying to getPooledConnectionfromPool due to " + ex);
           ex.printStackTrace();
         }
       }
@@ -157,7 +157,7 @@ public class ConnectionPoolCacheImplJUnitTest {
           // System.out.println(" Returned connection " + display + "from "+
           // threadName);
         } catch (Exception ex) {
-          fail("Exception occured in trying to returnPooledConnectiontoPool due to " + ex);
+          fail("Exception occurred in trying to returnPooledConnectiontoPool due to " + ex);
           ex.printStackTrace();
         }
       }
@@ -185,7 +185,7 @@ public class ConnectionPoolCacheImplJUnitTest {
           // System.out.println(" ********** Got connection " + numConn2+ "from
           // " + threadName);
         } catch (Exception ex) {
-          fail("Exception occured in trying to getPooledConnectionFromPool due to " + ex);
+          fail("Exception occurred in trying to getPooledConnectionFromPool due to " + ex);
           ex.printStackTrace();
         }
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
index 8eac764..112e51a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
@@ -273,7 +273,7 @@ public class ConnectionPoolingJUnitTest {
           // conn.close();
           logger.debug(" Returned connection " + display + "from " + threadName);
         } catch (Exception ex) {
-          fail("Exception occured in trying to returnPooledConnectiontoPool due to " + ex);
+          fail("Exception occurred in trying to returnPooledConnectiontoPool due to " + ex);
           ex.printStackTrace();
         }
       }


Mime
View raw message