geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sai_boorlaga...@apache.org
Subject [06/55] [abbrv] incubator-geode git commit: GEODE-1276: Change UnitTests file system to IntegrationTest category GEODE-1307: Rename HeterogenousLuceneSerializer to HeterogeneousLuceneSerializer GEODE-1279: Tests for old TRAC bugs should be renamed to use
Date Tue, 24 May 2016 18:53:47 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/AbstractStoredObjectTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/AbstractStoredObjectTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/AbstractStoredObjectTestBase.java
index 24cb2fd..0659b81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/AbstractStoredObjectTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/AbstractStoredObjectTestBase.java
@@ -14,190 +14,186 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.offheap;
 
-import com.gemstone.gemfire.internal.DataSerializableFixedID;
-import com.gemstone.gemfire.internal.offheap.StoredObject;
-import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.io.DataOutput;
 import java.io.IOException;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import org.junit.Test;
+
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
 
 public abstract class AbstractStoredObjectTestBase {
 
-    /* Returns Value as an Object Eg: Integer or UserDefinedRegionValue */
-    protected abstract Object getValue();
+  /* Returns Value as an Object Eg: Integer or UserDefinedRegionValue */
+  protected abstract Object getValue();
 
-    /* Returns Value as an ByteArray (not serialized) */
-    protected abstract byte[] getValueAsByteArray();
+  /* Returns Value as an ByteArray (not serialized) */
+  protected abstract byte[] getValueAsByteArray();
 
-    protected abstract Object convertByteArrayToObject(byte[] valueInByteArray);
+  protected abstract Object convertByteArrayToObject(byte[] valueInByteArray);
 
-    protected abstract Object convertSerializedByteArrayToObject(byte[] valueInSerializedByteArray);
+  protected abstract Object convertSerializedByteArrayToObject(byte[] valueInSerializedByteArray);
 
-    protected abstract StoredObject createValueAsUnserializedStoredObject(Object value);
+  protected abstract StoredObject createValueAsUnserializedStoredObject(Object value);
 
-    protected abstract StoredObject createValueAsSerializedStoredObject(Object value);
+  protected abstract StoredObject createValueAsSerializedStoredObject(Object value);
 
-    @Test
-    public void getValueAsDeserializedHeapObjectShouldReturnDeserializedValueIfValueIsSerialized() {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void getValueAsDeserializedHeapObjectShouldReturnDeserializedValueIfValueIsSerialized() {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        Object actualRegionEntryValue = storedObject.getValueAsDeserializedHeapObject();
-        assertEquals(regionEntryValue, actualRegionEntryValue);
-    }
+    Object actualRegionEntryValue = storedObject.getValueAsDeserializedHeapObject();
+    assertEquals(regionEntryValue, actualRegionEntryValue);
+  }
 
-    @Test
-    public void getValueAsDeserializedHeapObjectShouldReturnValueAsIsIfNotSerialized() {
-        byte[] regionEntryValue = getValueAsByteArray();
-        StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+  @Test
+  public void getValueAsDeserializedHeapObjectShouldReturnValueAsIsIfNotSerialized() {
+    byte[] regionEntryValue = getValueAsByteArray();
+    StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
 
-        byte[] deserializedValue = (byte[]) storedObject.getValueAsDeserializedHeapObject();
-        assertArrayEquals(regionEntryValue, deserializedValue);
-    }
+    byte[] deserializedValue = (byte[]) storedObject.getValueAsDeserializedHeapObject();
+    assertArrayEquals(regionEntryValue, deserializedValue);
+  }
 
-    @Test
-    public void getValueAsHeapByteArrayShouldReturnSerializedByteArrayIfValueIsSerialized() {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void getValueAsHeapByteArrayShouldReturnSerializedByteArrayIfValueIsSerialized() {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        byte[] valueInSerializedByteArray = (byte[]) storedObject.getValueAsHeapByteArray();
-        Object actualRegionEntryValue = convertSerializedByteArrayToObject(valueInSerializedByteArray);
+    byte[] valueInSerializedByteArray = (byte[]) storedObject.getValueAsHeapByteArray();
+    Object actualRegionEntryValue = convertSerializedByteArrayToObject(valueInSerializedByteArray);
 
-        assertEquals(regionEntryValue, actualRegionEntryValue);
-    }
+    assertEquals(regionEntryValue, actualRegionEntryValue);
+  }
 
-    @Test
-    public void getValueAsHeapByteArrayShouldReturnDeserializedByteArrayIfValueIsNotSerialized() {
-        Object regionEntryValue = getValue();
+  @Test
+  public void getValueAsHeapByteArrayShouldReturnDeserializedByteArrayIfValueIsNotSerialized() {
+    Object regionEntryValue = getValue();
 
-        StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+    StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
 
-        byte[] valueInByteArray = (byte[]) storedObject.getValueAsHeapByteArray();
+    byte[] valueInByteArray = (byte[]) storedObject.getValueAsHeapByteArray();
 
-        Object actualRegionEntryValue = convertByteArrayToObject(valueInByteArray);
+    Object actualRegionEntryValue = convertByteArrayToObject(valueInByteArray);
 
-        assertEquals(regionEntryValue, actualRegionEntryValue);
-    }
+    assertEquals(regionEntryValue, actualRegionEntryValue);
+  }
 
-    @Test
-    public void getStringFormShouldReturnStringFromDeserializedValue() {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void getStringFormShouldReturnStringFromDeserializedValue() {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        String stringForm = storedObject.getStringForm();
-        assertEquals(String.valueOf(regionEntryValue), stringForm);
-    }
+    String stringForm = storedObject.getStringForm();
+    assertEquals(String.valueOf(regionEntryValue), stringForm);
+  }
 
-    @Test
-    public void getValueShouldReturnSerializedValue() {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void getValueShouldReturnSerializedValue() {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        byte[] valueAsSerializedByteArray = (byte[]) storedObject.getValue();
+    byte[] valueAsSerializedByteArray = (byte[]) storedObject.getValue();
 
-        Object actualValue = convertSerializedByteArrayToObject(valueAsSerializedByteArray);
+    Object actualValue = convertSerializedByteArrayToObject(valueAsSerializedByteArray);
 
-        assertEquals(regionEntryValue, actualValue);
-    }
+    assertEquals(regionEntryValue, actualValue);
+  }
 
-    @Test(expected = IllegalStateException.class)
-    public void getValueShouldThrowExceptionIfValueIsNotSerialized() {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+  @Test(expected = IllegalStateException.class)
+  public void getValueShouldThrowExceptionIfValueIsNotSerialized() {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
 
-        byte[] deserializedValue = (byte[]) storedObject.getValue();
-    }
+    byte[] deserializedValue = (byte[]) storedObject.getValue();
+  }
 
-    @Test
-    public void getDeserializedWritableCopyShouldReturnDeserializedValue() {
-        byte[] regionEntryValue = getValueAsByteArray();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void getDeserializedWritableCopyShouldReturnDeserializedValue() {
+    byte[] regionEntryValue = getValueAsByteArray();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        assertArrayEquals(regionEntryValue, (byte[]) storedObject.getDeserializedWritableCopy(null, null));
-    }
+    assertArrayEquals(regionEntryValue, (byte[]) storedObject.getDeserializedWritableCopy(null, null));
+  }
 
-    @Test
-    public void writeValueAsByteArrayWritesToProvidedDataOutput() throws IOException {
-        byte[] regionEntryValue = getValueAsByteArray();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void writeValueAsByteArrayWritesToProvidedDataOutput() throws IOException {
+    byte[] regionEntryValue = getValueAsByteArray();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.writeValueAsByteArray(dataOutput);
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.writeValueAsByteArray(dataOutput);
 
-        verify(dataOutput, times(1)).write(storedObject.getSerializedValue(), 0 , storedObject.getSerializedValue().length);
-    }
+    verify(dataOutput, times(1)).write(storedObject.getSerializedValue(), 0, storedObject.getSerializedValue().length);
+  }
 
-    @Test
-    public void sendToShouldWriteSerializedValueToDataOutput() throws IOException {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void sendToShouldWriteSerializedValueToDataOutput() throws IOException {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.sendTo(dataOutput);
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.sendTo(dataOutput);
 
-        verify(dataOutput, times(1)).write(storedObject.getSerializedValue());
-    }
+    verify(dataOutput, times(1)).write(storedObject.getSerializedValue());
+  }
 
-    @Test
-    public void sendToShouldWriteDeserializedObjectToDataOutput() throws IOException {
-        byte[] regionEntryValue = getValueAsByteArray();
-        StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+  @Test
+  public void sendToShouldWriteDeserializedObjectToDataOutput() throws IOException {
+    byte[] regionEntryValue = getValueAsByteArray();
+    StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.sendTo(dataOutput);
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.sendTo(dataOutput);
 
-        verify(dataOutput, times(1)).write(regionEntryValue, 0, regionEntryValue.length);
-    }
+    verify(dataOutput, times(1)).write(regionEntryValue, 0, regionEntryValue.length);
+  }
 
-    @Test
-    public void sendAsByteArrayShouldWriteSerializedValueToDataOutput() throws IOException {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void sendAsByteArrayShouldWriteSerializedValueToDataOutput() throws IOException {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.sendAsByteArray(dataOutput);
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.sendAsByteArray(dataOutput);
 
-        verify(dataOutput, times(1)).write(storedObject.getSerializedValue(), 0, storedObject.getSerializedValue().length);
-    }
+    verify(dataOutput, times(1)).write(storedObject.getSerializedValue(), 0, storedObject.getSerializedValue().length);
+  }
 
-    @Test
-    public void sendAsByteArrayShouldWriteDeserializedObjectToDataOutput() throws IOException {
-        byte[] regionEntryValue = getValueAsByteArray();
-        StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+  @Test
+  public void sendAsByteArrayShouldWriteDeserializedObjectToDataOutput() throws IOException {
+    byte[] regionEntryValue = getValueAsByteArray();
+    StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.sendAsByteArray(dataOutput);
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.sendAsByteArray(dataOutput);
 
-        verify(dataOutput, times(1)).write(regionEntryValue, 0, regionEntryValue.length);
-    }
+    verify(dataOutput, times(1)).write(regionEntryValue, 0, regionEntryValue.length);
+  }
 
-    @Test
-    public void sendAsCachedDeserializableShouldWriteSerializedValueToDataOutputAndSetsHeader() throws IOException {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+  @Test
+  public void sendAsCachedDeserializableShouldWriteSerializedValueToDataOutputAndSetsHeader() throws IOException {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsSerializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.sendAsCachedDeserializable(dataOutput);
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.sendAsCachedDeserializable(dataOutput);
 
-        verify(dataOutput, times(1)).writeByte((DataSerializableFixedID.VM_CACHED_DESERIALIZABLE));
-        verify(dataOutput, times(1)).write(storedObject.getSerializedValue(), 0, storedObject.getSerializedValue().length);
-    }
+    verify(dataOutput, times(1)).writeByte((DataSerializableFixedID.VM_CACHED_DESERIALIZABLE));
+    verify(dataOutput, times(1)).write(storedObject.getSerializedValue(), 0, storedObject.getSerializedValue().length);
+  }
 
-    @Test(expected = IllegalStateException.class)
-    public void sendAsCachedDeserializableShouldThrowExceptionIfValueIsNotSerialized() throws IOException {
-        Object regionEntryValue = getValue();
-        StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+  @Test(expected = IllegalStateException.class)
+  public void sendAsCachedDeserializableShouldThrowExceptionIfValueIsNotSerialized() throws IOException {
+    Object regionEntryValue = getValue();
+    StoredObject storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
 
-        DataOutput dataOutput = mock(DataOutput.class);
-        storedObject.sendAsCachedDeserializable(dataOutput);
-    }
+    DataOutput dataOutput = mock(DataOutput.class);
+    storedObject.sendAsCachedDeserializable(dataOutput);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DataTypeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DataTypeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DataTypeJUnitTest.java
index fe176e0..00ad891 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DataTypeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DataTypeJUnitTest.java
@@ -16,7 +16,9 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
@@ -49,12 +51,10 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
-import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.Instantiator;
@@ -93,6 +93,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("com.gemstone.gemfire.internal.DataSerializableFixedID:" + ReplyMessage.class.getName(), type);
   }
+
   @Test
   public void testDataSerializableFixedIDShort() throws IOException {
     DataSerializableFixedID value = new ShutdownAllResponse();
@@ -103,14 +104,15 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("com.gemstone.gemfire.internal.DataSerializableFixedID:" + ShutdownAllResponse.class.getName(), type);
   }
+
   @Test
   public void testDataSerializableFixedIDInt() throws IOException, ClassNotFoundException {
     Integer someDSFIDInt = new Integer(1);
-    
+
     PowerMockito.mockStatic(DSFIDFactory.class);
     when(DSFIDFactory.create(eq(someDSFIDInt), any())).thenReturn(someDSFIDInt);
     DSFIDFactory.create(someDSFIDInt, null);
-    
+
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeByte(DSCODE.DS_FIXED_ID_INT, out);
@@ -119,6 +121,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("com.gemstone.gemfire.internal.DataSerializableFixedID:" + Integer.class.getName(), type);
   }
+
   @Test
   public void testDataSerializableFixedIDClass() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -129,6 +132,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("com.gemstone.gemfire.internal.DataSerializableFixedID:" + Integer.class.getName(), type);
   }
+
   @Test
   public void testNull() throws IOException {
     Object value = null;
@@ -139,6 +143,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("null", type);
   }
+
   @Test
   public void testString() throws IOException {
     String value = "this is a string";
@@ -149,6 +154,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.String", type);
   }
+
   @Test
   public void testNullString() throws IOException {
     String value = null;
@@ -159,6 +165,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.String", type);
   }
+
   @Test
   public void testClass() throws IOException {
     Class<?> value = String.class;
@@ -169,9 +176,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Class", type);
   }
+
   @Test
   public void testDate() throws IOException {
-    Date value = new Date(); 
+    Date value = new Date();
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out); // NOT writeDate
@@ -179,6 +187,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.Date", type);
   }
+
   @Test
   public void testFile() throws IOException {
     File value = new File("tmp");
@@ -189,6 +198,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.io.File", type);
   }
+
   @Test
   public void testInetAddress() throws IOException {
     InetAddress value = InetAddress.getLocalHost();
@@ -199,6 +209,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.net.InetAddress", type);
   }
+
   @Test
   public void testBoolean() throws IOException {
     Boolean value = Boolean.TRUE;
@@ -209,6 +220,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Boolean", type);
   }
+
   @Test
   public void testCharacter() throws IOException {
     Character value = Character.valueOf('c');
@@ -219,9 +231,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Character", type);
   }
+
   @Test
   public void testByte() throws IOException {
-    Byte value = Byte.valueOf((byte)0);
+    Byte value = Byte.valueOf((byte) 0);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -229,9 +242,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Byte", type);
   }
+
   @Test
   public void testShort() throws IOException {
-    Short value = Short.valueOf((short)1);
+    Short value = Short.valueOf((short) 1);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -239,6 +253,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Short", type);
   }
+
   @Test
   public void testInteger() throws IOException {
     Integer value = Integer.valueOf(1);
@@ -249,6 +264,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Integer", type);
   }
+
   @Test
   public void testLong() throws IOException {
     Long value = Long.valueOf(1);
@@ -259,9 +275,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Long", type);
   }
+
   @Test
   public void testFloat() throws IOException {
-    Float value = Float.valueOf((float)1.0);
+    Float value = Float.valueOf((float) 1.0);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -269,9 +286,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Float", type);
   }
+
   @Test
   public void testDouble() throws IOException {
-    Double value = Double.valueOf((double)1.0);
+    Double value = Double.valueOf((double) 1.0);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -279,6 +297,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Double", type);
   }
+
   @Test
   public void testByteArray() throws IOException {
     byte[] value = new byte[10];
@@ -289,6 +308,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("byte[]", type);
   }
+
   @Test
   public void testByteArrays() throws IOException {
     byte[][] value = new byte[1][1];
@@ -299,6 +319,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("byte[][]", type);
   }
+
   @Test
   public void testShortArray() throws IOException {
     short[] value = new short[1];
@@ -309,6 +330,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("short[]", type);
   }
+
   @Test
   public void testStringArray() throws IOException {
     String[] value = new String[1];
@@ -319,6 +341,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.String[]", type);
   }
+
   @Test
   public void testIntArray() throws IOException {
     int[] value = new int[1];
@@ -329,6 +352,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("int[]", type);
   }
+
   @Test
   public void testFloatArray() throws IOException {
     float[] value = new float[1];
@@ -339,6 +363,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("float[]", type);
   }
+
   @Test
   public void testLongArray() throws IOException {
     long[] value = new long[1];
@@ -349,6 +374,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("long[]", type);
   }
+
   @Test
   public void testDoubleArray() throws IOException {
     double[] value = new double[1];
@@ -359,6 +385,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("double[]", type);
   }
+
   @Test
   public void testBooleanArray() throws IOException {
     boolean[] value = new boolean[1];
@@ -369,6 +396,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("boolean[]", type);
   }
+
   @Test
   public void testCharArray() throws IOException {
     char[] value = new char[1];
@@ -379,6 +407,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("char[]", type);
   }
+
   @Test
   public void testObjectArray() throws IOException {
     Object[] value = new Object[1];
@@ -389,6 +418,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Object[]", type);
   }
+
   @Test
   public void testArrayList() throws IOException {
     ArrayList<Object> value = new ArrayList<Object>();
@@ -399,6 +429,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.ArrayList", type);
   }
+
   @Test
   public void testLinkedList() throws IOException {
     LinkedList<Object> value = new LinkedList<Object>();
@@ -409,6 +440,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.LinkedList", type);
   }
+
   @Test
   public void testHashSet() throws IOException {
     HashSet<Object> value = new HashSet<Object>();
@@ -419,6 +451,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.HashSet", type);
   }
+
   @Test
   public void testLinkedHashSet() throws IOException {
     LinkedHashSet<Object> value = new LinkedHashSet<Object>();
@@ -429,9 +462,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.LinkedHashSet", type);
   }
+
   @Test
   public void testHashMap() throws IOException {
-    HashMap<Object,Object> value = new HashMap<Object,Object>();
+    HashMap<Object, Object> value = new HashMap<Object, Object>();
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -439,9 +473,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.HashMap", type);
   }
+
   @Test
   public void testIdentityHashMap() throws IOException {
-    IdentityHashMap<Object,Object> value = new IdentityHashMap<Object,Object>();
+    IdentityHashMap<Object, Object> value = new IdentityHashMap<Object, Object>();
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -449,9 +484,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.IdentityHashMap", type);
   }
+
   @Test
   public void testHashtable() throws IOException {
-    Hashtable<Object,Object> value = new Hashtable<Object,Object>();
+    Hashtable<Object, Object> value = new Hashtable<Object, Object>();
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -459,9 +495,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.Hashtable", type);
   }
+
   @Test
   public void testConcurrentHashMap() throws IOException { // java.io.Serializable (broken)
-    ConcurrentHashMap<Object,Object> value = new ConcurrentHashMap<Object,Object>();
+    ConcurrentHashMap<Object, Object> value = new ConcurrentHashMap<Object, Object>();
     value.put("key1", "value1");
     value.put("key2", "value2");
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -472,6 +509,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.io.Serializable:java.util.concurrent.ConcurrentHashMap", type);
   }
+
   @Test
   public void testProperties() throws IOException {
     Properties value = new Properties();
@@ -482,10 +520,11 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.Properties", type);
   }
+
   @Test
   public void testTimeUnit() throws IOException {
     final EnumSet<TimeUnit> optimizedTimeUnits = EnumSet.range(TimeUnit.NANOSECONDS, TimeUnit.SECONDS);
-    for (TimeUnit v: TimeUnit.values()) {
+    for (TimeUnit v : TimeUnit.values()) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       DataOutputStream out = new DataOutputStream(baos);
       DataSerializer.writeObject(v, out);
@@ -498,6 +537,7 @@ public class DataTypeJUnitTest {
       }
     }
   }
+
   @Test
   public void testVector() throws IOException {
     Vector<Object> value = new Vector<Object>();
@@ -508,6 +548,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.Vector", type);
   }
+
   @Test
   public void testStack() throws IOException {
     Stack<Object> value = new Stack<Object>();
@@ -518,9 +559,10 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.Stack", type);
   }
+
   @Test
   public void testTreeMap() throws IOException {
-    TreeMap<Object,Object> value = new TreeMap<Object,Object>();
+    TreeMap<Object, Object> value = new TreeMap<Object, Object>();
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     DataSerializer.writeObject(value, out);
@@ -528,6 +570,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.TreeMap", type);
   }
+
   @Test
   public void testTreeSet() throws IOException {
     TreeSet<Object> value = new TreeSet<Object>();
@@ -538,6 +581,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.TreeSet", type);
   }
+
   @Test
   public void testBooleanType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -547,6 +591,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Boolean.class", type);
   }
+
   @Test
   public void testCharacterType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -556,6 +601,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Character.class", type);
   }
+
   @Test
   public void testByteType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -565,6 +611,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Byte.class", type);
   }
+
   @Test
   public void testShortType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -574,6 +621,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Short.class", type);
   }
+
   @Test
   public void testIntegerType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -583,6 +631,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Integer.class", type);
   }
+
   @Test
   public void testLongType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -592,6 +641,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Long.class", type);
   }
+
   @Test
   public void testFloatType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -601,6 +651,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Float.class", type);
   }
+
   @Test
   public void testDoubleType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -610,6 +661,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Double.class", type);
   }
+
   @Test
   public void testVoidType() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -619,6 +671,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.lang.Void.class", type);
   }
+
   //TODO: these tests have to corrected once USER_CLASS, USER_CLASS_2, USER_CLASS_4 are implemented.
   @Test
   public void getDataTypeShouldReturnUserClass() throws IOException {
@@ -631,6 +684,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertThat(type).isEqualTo("DataSerializer: with Id:" + someUserClassId);
   }
+
   @Test
   public void getDataTypeShouldReturnUserClass2() throws IOException {
     short someUserClass2Id = 1;
@@ -642,6 +696,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertThat(type).isEqualTo("DataSerializer: with Id:" + someUserClass2Id);
   }
+
   @Test
   public void getDataTypeShouldReturnUserClass4() throws IOException {
     int someUserClass4Id = 1;
@@ -653,72 +708,76 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertThat(type).isEqualTo("DataSerializer: with Id:" + someUserClass4Id);
   }
+
   @Test
   public void getDataTypeShouldReturnUserDataSeriazliable() throws IOException {
     Instantiator mockInstantiator = PowerMockito.mock(Instantiator.class);
     doReturn(CustId.class).when(mockInstantiator).getInstantiatedClass();
     mockInstantiator.getInstantiatedClass();
-    
+
     int someClassId = 1;
-    
+
     PowerMockito.mockStatic(InternalInstantiator.class);
     when(InternalInstantiator.getClassId(mockInstantiator.getClass())).thenReturn(someClassId);
     when(InternalInstantiator.getInstantiator(someClassId)).thenReturn(mockInstantiator);
-        
+
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     out.writeByte(DSCODE.USER_DATA_SERIALIZABLE);
     out.writeByte(someClassId);
-    
+
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
-    
+
     assertThat(type).isEqualTo("com.gemstone.gemfire.Instantiator:com.gemstone.gemfire.internal.cache.execute.data.CustId");
   }
+
   @Test
   public void getDataTypeShouldReturnUserDataSeriazliable2() throws IOException {
     Instantiator mockInstantiator = PowerMockito.mock(Instantiator.class);
     doReturn(CustId.class).when(mockInstantiator).getInstantiatedClass();
     mockInstantiator.getInstantiatedClass();
-    
+
     int someClassId = 1;
-    
+
     PowerMockito.mockStatic(InternalInstantiator.class);
     when(InternalInstantiator.getClassId(mockInstantiator.getClass())).thenReturn(someClassId);
     when(InternalInstantiator.getInstantiator(someClassId)).thenReturn(mockInstantiator);
-        
+
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     out.writeByte(DSCODE.USER_DATA_SERIALIZABLE_2);
     out.writeShort(someClassId);
-    
+
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
-    
+
     assertThat(type).isEqualTo("com.gemstone.gemfire.Instantiator:com.gemstone.gemfire.internal.cache.execute.data.CustId");
   }
+
   @Test
   public void getDataTypeShouldReturnUserDataSeriazliable4() throws IOException {
     Instantiator mockInstantiator = PowerMockito.mock(Instantiator.class);
     doReturn(CustId.class).when(mockInstantiator).getInstantiatedClass();
     mockInstantiator.getInstantiatedClass();
-    
+
     int someClassId = 1;
-    
+
     PowerMockito.mockStatic(InternalInstantiator.class);
     when(InternalInstantiator.getClassId(mockInstantiator.getClass())).thenReturn(someClassId);
     when(InternalInstantiator.getInstantiator(someClassId)).thenReturn(mockInstantiator);
-        
+
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     out.writeByte(DSCODE.USER_DATA_SERIALIZABLE_4);
     out.writeInt(someClassId);
-    
+
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
-    
+
     assertThat(type).isEqualTo("com.gemstone.gemfire.Instantiator:com.gemstone.gemfire.internal.cache.execute.data.CustId");
   }
+
   @Test
   public void testDataSerializable() throws IOException {
     DataSerializableImpl value = new DataSerializableImpl(new Random());
@@ -729,6 +788,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("com.gemstone.gemfire.DataSerializable:" + DataSerializableImpl.class.getName(), type);
   }
+
   @Test
   public void testSerializable() throws IOException {
     SerializableClass value = new SerializableClass();
@@ -739,9 +799,11 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.io.Serializable:" + SerializableClass.class.getName(), type);
   }
+
   @SuppressWarnings("serial")
   public static class SerializableClass implements Serializable {
   }
+
   @Test
   public void getDataTypeShouldReturnPDXType() throws IOException {
     int somePdxTypeInt = 1;
@@ -766,11 +828,12 @@ public class DataTypeJUnitTest {
 
     assertThat(type).isEqualTo("com.gemstone.gemfire.pdx.PdxInstance:PDXType");
   }
+
   @Test
   public void getDataTypeShouldReturnUnknownIfPDXTypeIsNull() throws IOException {
     int somePdxTypeInt = 1;
     PdxType somePdxType = null;
-    
+
     TypeRegistry mockTypeRegistry = mock(TypeRegistry.class);
     when(mockTypeRegistry.getType(somePdxTypeInt)).thenReturn(somePdxType);
 
@@ -787,8 +850,9 @@ public class DataTypeJUnitTest {
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
 
-    assertThat(type).isEqualTo("com.gemstone.gemfire.pdx.PdxInstance: unknown id="+somePdxTypeInt);
+    assertThat(type).isEqualTo("com.gemstone.gemfire.pdx.PdxInstance: unknown id=" + somePdxTypeInt);
   }
+
   @Test
   public void getDataTypeShouldReturnPDXRegistryClosedForPDXTypeWhenCacheIsClosed() throws IOException {
     int somePdxTypeInt = 1;
@@ -805,6 +869,7 @@ public class DataTypeJUnitTest {
 
     assertThat(type).isEqualTo("com.gemstone.gemfire.pdx.PdxInstance:PdxRegistryClosed");
   }
+
   @Test
   public void getDataTypeShouldReturnPDXEnumType() throws IOException {
     int somePdxEnumId = 1;
@@ -829,6 +894,7 @@ public class DataTypeJUnitTest {
 
     assertThat(type).isEqualTo("PdxRegistry/java.lang.Enum:PDXENUM");
   }
+
   @Test
   public void getDataTypeShouldReturnPDXRegistryClosedForEnumTypeWhenCacheIsClosed() throws IOException {
     int someArrayLength = 1;
@@ -845,6 +911,7 @@ public class DataTypeJUnitTest {
 
     assertThat(type).isEqualTo("PdxRegistry/java.lang.Enum:PdxRegistryClosed");
   }
+
   @Test
   public void getDataTypeShouldReturnGemfireEnum() throws IOException {
     PowerMockito.mockStatic(DataSerializer.class);
@@ -858,6 +925,7 @@ public class DataTypeJUnitTest {
 
     assertThat(type).isEqualTo("java.lang.Enum:GEMFIRE_ENUM");
   }
+
   // TODO:PDX_INLINE_ENUM
   @Test
   public void testBigInteger() throws IOException {
@@ -869,6 +937,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.math.BigInteger", type);
   }
+
   @Test
   public void testBigDecimal() throws IOException {
     BigDecimal value = BigDecimal.ZERO;
@@ -879,6 +948,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.math.BigDecimal", type);
   }
+
   @Test
   public void testUUID() throws IOException {
     UUID value = new UUID(Long.MAX_VALUE, Long.MIN_VALUE);
@@ -889,6 +959,7 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.util.UUID", type);
   }
+
   @Test
   public void testSQLTimestamp() throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -898,10 +969,11 @@ public class DataTypeJUnitTest {
     String type = DataType.getDataType(bytes);
     assertEquals("java.sql.Timestamp", type);
   }
+
   @Test
   public void testUnknownHeaderType() throws IOException {
     byte unknownType = 0;
-    
+
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
     out.writeByte(unknownType);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
index 671a2b5..05725e4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
@@ -32,14 +32,15 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class DisconnectingOutOfOffHeapMemoryListenerJUnitTest {
-  @Rule
-  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
-  
+
   private final InternalDistributedSystem ids = mock(InternalDistributedSystem.class);
   private final OutOfOffHeapMemoryException ex = new OutOfOffHeapMemoryException();
   private final LogWriter lw = mock(LogWriter.class);
   private final DM dm = mock(DM.class);
 
+  @Rule
+  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+  
   @Before
   public void setUp() throws Exception {
     when(ids.getLogWriter()).thenReturn(lw);
@@ -81,6 +82,7 @@ public class DisconnectingOutOfOffHeapMemoryListenerJUnitTest {
     listener.outOfOffHeapMemory(ex);
     verify(dm).setRootCause(ex);
   }
+
   @Test
   public void setRootCauseNotCalledWhenGetRootCauseReturnsNonNull() {
     DisconnectingOutOfOffHeapMemoryListener listener = new DisconnectingOutOfOffHeapMemoryListener(ids);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
index 569b003..eac234b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
@@ -14,19 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 import java.util.Arrays;
 
 import org.assertj.core.api.JUnitSoftAssertions;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -39,25 +36,12 @@ public class FragmentJUnitTest {
 
   private SlabImpl[] slabs;
 
-  static {
-    ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
-  }
-  
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   
   @Rule
   public JUnitSoftAssertions softly = new JUnitSoftAssertions();
 
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-  }
-
   @Before
   public void setUp() throws Exception {
     SlabImpl slab1 = new SlabImpl((int)OffHeapStorage.MIN_SLAB_SIZE);
@@ -71,15 +55,14 @@ public class FragmentJUnitTest {
       slabs[i].free();
     }
   }
-  
-  
+
   @Test
   public void fragmentConstructorThrowsExceptionForNon8ByteAlignedAddress() {
-      expectedException.expect(IllegalStateException.class);
-      expectedException.expectMessage("address was not 8 byte aligned");
+    expectedException.expect(IllegalStateException.class);
+    expectedException.expectMessage("address was not 8 byte aligned");
 
-      new Fragment(slabs[0].getMemoryAddress() + 2, 0);
-      fail("Constructor failed to throw exception for non-8-byte alignment");
+    new Fragment(slabs[0].getMemoryAddress() + 2, 0);
+    fail("Constructor failed to throw exception for non-8-byte alignment");
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
index 28ff3ac..4cf1df0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
@@ -16,10 +16,10 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
 import static com.googlecode.catchexception.CatchException.*;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,10 +27,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 
 import org.apache.logging.log4j.Logger;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -38,23 +35,11 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class FreeListManagerTest {
-  static {
-    ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
-  }
 
   private final int DEFAULT_SLAB_SIZE = 1024*1024*5;
   private final MemoryAllocatorImpl ma = mock(MemoryAllocatorImpl.class);
   private final OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class);
   private TestableFreeListManager freeListManager;
-  
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-  }
 
   @Before
   public void setUp() throws Exception {
@@ -829,9 +814,11 @@ public class FreeListManagerTest {
    */
   private static class TestableFragment extends Fragment {
     private boolean allocateCalled = false;
+
     public TestableFragment(long addr, int size) {
       super(addr, size);
     }
+
     @Override
     public boolean allocate(int oldOffset, int newOffset) {
       if (!allocateCalled) {
@@ -841,9 +828,15 @@ public class FreeListManagerTest {
       return super.allocate(oldOffset, newOffset);
     }
   }
+
   private static class TestableFreeListManager extends FreeListManager {
     private boolean firstTime = true;
-    
+    private boolean firstDefragmentation = true;
+
+    public TestableFreeListManager(MemoryAllocatorImpl ma, Slab[] slabs) {
+      super(ma, slabs);
+    }
+
     @Override
     protected Fragment createFragment(long addr, int size) {
       return new TestableFragment(addr, size);
@@ -861,7 +854,6 @@ public class FreeListManagerTest {
       return super.createFreeListForEmptySlot(freeLists, idx);
     }
 
-    public boolean firstDefragmentation = true;
     @Override
     protected void afterDefragmentationCountFetched() {
       if (this.firstDefragmentation) {
@@ -871,9 +863,5 @@ public class FreeListManagerTest {
       }
     }
     
-    public TestableFreeListManager(MemoryAllocatorImpl ma, Slab[] slabs) {
-      super(ma, slabs);
-    }
-    
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/LifecycleListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/LifecycleListenerJUnitTest.java
index 71d33ab..890bbf3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/LifecycleListenerJUnitTest.java
@@ -16,16 +16,12 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -35,18 +31,18 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 /**
  * Tests LifecycleListener
- * 
  */
 @Category(UnitTest.class)
 public class LifecycleListenerJUnitTest {
-  @Rule
-  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
 
   private final List<LifecycleListenerCallback> afterCreateCallbacks = new ArrayList<LifecycleListenerCallback>();
   private final List<LifecycleListenerCallback> afterReuseCallbacks = new ArrayList<LifecycleListenerCallback>();
   private final List<LifecycleListenerCallback> beforeCloseCallbacks = new ArrayList<LifecycleListenerCallback>();
   private final TestLifecycleListener listener = new TestLifecycleListener(this.afterCreateCallbacks, this.afterReuseCallbacks, this.beforeCloseCallbacks);
 
+  @Rule
+  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+
   @After
   public void tearDown() throws Exception {
     LifecycleListener.removeLifecycleListener(this.listener);
@@ -65,15 +61,15 @@ public class LifecycleListenerJUnitTest {
     MemoryAllocatorImpl ma = MemoryAllocatorImpl.createForUnitTest(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(),
         new SlabImpl[] { slab });
 
-    Assert.assertEquals(0, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(0, this.beforeCloseCallbacks.size());
+    assertEquals(0, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(0, this.beforeCloseCallbacks.size());
 
     ma.close();
 
-    Assert.assertEquals(0, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(0, this.beforeCloseCallbacks.size());
+    assertEquals(0, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(0, this.beforeCloseCallbacks.size());
 
     LifecycleListener.removeLifecycleListener(this.listener);
   }
@@ -85,22 +81,21 @@ public class LifecycleListenerJUnitTest {
     MemoryAllocatorImpl ma = MemoryAllocatorImpl.createForUnitTest(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(),
         new SlabImpl[] { slab });
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(0, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(0, this.beforeCloseCallbacks.size());
 
     closeAndFree(ma);
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(1, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(1, this.beforeCloseCallbacks.size());
     
     LifecycleListener.removeLifecycleListener(this.listener);
   }
 
   @Test
   public void testCallbacksAreCalledAfterReuse() {
-
     LifecycleListener.addLifecycleListener(this.listener);
 
     System.setProperty(MemoryAllocatorImpl.FREE_OFF_HEAP_MEMORY_PROPERTY, "false");
@@ -108,34 +103,34 @@ public class LifecycleListenerJUnitTest {
     SlabImpl slab = new SlabImpl(1024); // 1k
     MemoryAllocatorImpl ma = createAllocator(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), new SlabImpl[] { slab });
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(0, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(0, this.beforeCloseCallbacks.size());
 
     ma.close();
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(1, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(1, this.beforeCloseCallbacks.size());
 
     ma = createAllocator(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), null);
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(1, this.afterReuseCallbacks.size());
-    Assert.assertEquals(1, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(1, this.afterReuseCallbacks.size());
+    assertEquals(1, this.beforeCloseCallbacks.size());
 
     MemoryAllocatorImpl ma2 = createAllocator(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), new SlabImpl[] { slab });
     assertEquals(null, ma2);
     
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(1, this.afterReuseCallbacks.size());
-    Assert.assertEquals(1, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(1, this.afterReuseCallbacks.size());
+    assertEquals(1, this.beforeCloseCallbacks.size());
 
     ma.close();
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(1, this.afterReuseCallbacks.size());
-    Assert.assertEquals(2, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(1, this.afterReuseCallbacks.size());
+    assertEquals(2, this.beforeCloseCallbacks.size());
   }
 
   private MemoryAllocatorImpl createAllocator(OutOfOffHeapMemoryListener ooohml, OffHeapMemoryStats ohms, SlabImpl[] slab) {
@@ -157,37 +152,36 @@ public class LifecycleListenerJUnitTest {
   
   @Test
   public void testCallbacksAreCalledAfterReuseWithFreeTrue() {
-
     LifecycleListener.addLifecycleListener(this.listener);
 
     SlabImpl slab = new SlabImpl(1024); // 1k
     MemoryAllocatorImpl ma = MemoryAllocatorImpl.createForUnitTest(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), new SlabImpl[] { slab });
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(0, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(0, this.beforeCloseCallbacks.size());
 
     closeAndFree(ma);
 
-    Assert.assertEquals(1, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(1, this.beforeCloseCallbacks.size());
+    assertEquals(1, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(1, this.beforeCloseCallbacks.size());
 
     slab = new SlabImpl(1024); // 1k
     MemoryAllocatorImpl ma2 = MemoryAllocatorImpl.createForUnitTest(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), new SlabImpl[] { slab });
 
-    Assert.assertEquals(2, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(1, this.beforeCloseCallbacks.size());
+    assertEquals(2, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(1, this.beforeCloseCallbacks.size());
 
     closeAndFree(ma);
 
-    Assert.assertEquals(2, this.afterCreateCallbacks.size());
-    Assert.assertEquals(0, this.afterReuseCallbacks.size());
-    Assert.assertEquals(2, this.beforeCloseCallbacks.size());
+    assertEquals(2, this.afterCreateCallbacks.size());
+    assertEquals(0, this.afterReuseCallbacks.size());
+    assertEquals(2, this.beforeCloseCallbacks.size());
   }
 
-  static final class LifecycleListenerCallback {
+  private static final class LifecycleListenerCallback {
     private final MemoryAllocatorImpl allocator;
     private final long timeStamp;
     private final Throwable creationTime;
@@ -199,7 +193,7 @@ public class LifecycleListenerJUnitTest {
     }
   }
 
-  static class TestLifecycleListener implements LifecycleListener {
+  private static class TestLifecycleListener implements LifecycleListener {
     private final List<LifecycleListenerCallback> afterCreateCallbacks;
     private final List<LifecycleListenerCallback> afterReuseCallbacks;
     private final List<LifecycleListenerCallback> beforeCloseCallbacks;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
index 0762d67..be1fcad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
@@ -16,8 +16,8 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.junit.Assert.*;
 import static com.googlecode.catchexception.CatchException.*;
+import static org.junit.Assert.*;
 
 import org.junit.After;
 import org.junit.Before;
@@ -26,8 +26,6 @@ import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-import junit.framework.TestCase;
-
 /**
  * Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorJUnitTest.java
index 582e8b9..a70fd8a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorJUnitTest.java
@@ -31,17 +31,21 @@ import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.OutOfOffHeapMemoryException;
 import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.internal.logging.NullLogWriter;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class MemoryAllocatorJUnitTest {
+
+  private long expectedMemoryUsage;
+  private boolean memoryUsageEventReceived;
+
   @Rule
   public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
 
   private static int round(int multiple, int v) {
     return ((v+multiple-1)/multiple)*multiple;
   }
+
   @Test
   public void testNullGetAllocator() {
     try {
@@ -50,6 +54,7 @@ public class MemoryAllocatorJUnitTest {
     } catch (CacheClosedException expected) {
     }
   }
+
   @Test
   public void testConstructor() {
     try {
@@ -58,6 +63,7 @@ public class MemoryAllocatorJUnitTest {
     } catch (IllegalArgumentException expected) {
     }
   }
+
   @Test
   public void testCreate() {
     System.setProperty(MemoryAllocatorImpl.FREE_OFF_HEAP_MEMORY_PROPERTY, "false");
@@ -149,6 +155,7 @@ public class MemoryAllocatorJUnitTest {
       assertTrue(stats.isClosed());
     }
   }
+
   @Test
   public void testBasics() {
     int BATCH_SIZE = 1;
@@ -254,6 +261,7 @@ public class MemoryAllocatorJUnitTest {
     MemoryAllocatorImpl.debugLog("test debug log", false);
     MemoryAllocatorImpl.debugLog("test debug log", true);
   }
+
   @Test
   public void testGetLostChunks() {
     SlabImpl slab = new SlabImpl(1024*1024);
@@ -264,6 +272,7 @@ public class MemoryAllocatorJUnitTest {
       MemoryAllocatorImpl.freeOffHeapMemory();
     }
   }
+
   @Test
   public void testFindSlab() {
     final int SLAB_SIZE = 1024*1024;
@@ -286,6 +295,7 @@ public class MemoryAllocatorJUnitTest {
       MemoryAllocatorImpl.freeOffHeapMemory();
     }
   }
+
   @Test
   public void testValidateAddressAndSize() {
     final int SLAB_SIZE = 1024*1024;
@@ -323,6 +333,7 @@ public class MemoryAllocatorJUnitTest {
       MemoryAllocatorImpl.freeOffHeapMemory();
     }
   }
+
   @Test
   public void testMemoryInspection() {
     final int SLAB_SIZE = 1024*1024;
@@ -502,8 +513,6 @@ public class MemoryAllocatorJUnitTest {
     }
   }
   
-  long expectedMemoryUsage;
-  boolean memoryUsageEventReceived;
   @Test
   public void testUsageEventListener() {
     final int perObjectOverhead = OffHeapStoredObject.HEADER_SIZE;
@@ -551,6 +560,7 @@ public class MemoryAllocatorJUnitTest {
       MemoryAllocatorImpl.freeOffHeapMemory();
     }
   }
+
   private void checkMcs(ArrayList<StoredObject> mcs) {
     for (StoredObject mc: mcs) {
       assertEquals(8+8, mc.getSize());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
index f0563ad..7648169 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.offheap;
 
 import static org.junit.Assert.*;
@@ -22,21 +21,18 @@ import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import java.lang.ClassNotFoundException;
 import java.nio.ByteBuffer;
 
 import org.assertj.core.api.JUnitSoftAssertions;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.*;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 
-import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.internal.DSCODE;
 import com.gemstone.gemfire.internal.cache.EntryEventImpl;
@@ -55,11 +51,8 @@ public class MemoryBlockNodeJUnitTest {
   };
   private StoredObject storedObject = null;
 
-  static {
-    ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
-  }
-  
-  @Rule public final ProvideSystemProperty myPropertyHasMyValue = new ProvideSystemProperty("gemfire.OFF_HEAP_DO_EXPENSIVE_VALIDATION", "true");
+  @Rule
+  public final ProvideSystemProperty myPropertyHasMyValue = new ProvideSystemProperty("gemfire.OFF_HEAP_DO_EXPENSIVE_VALIDATION", "true");
 
   @Rule
   public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
@@ -70,14 +63,6 @@ public class MemoryBlockNodeJUnitTest {
   @Rule
   public JUnitSoftAssertions softly = new JUnitSoftAssertions();
 
-  @BeforeClass
-  public static void setUpBeforeClass() {
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() {
-  }
-
   @Before
   public void setUp() {
     ooohml = mock(OutOfOffHeapMemoryListener.class);
@@ -89,16 +74,17 @@ public class MemoryBlockNodeJUnitTest {
   public void tearDown() {
     MemoryAllocatorImpl.freeOffHeapMemory();
   }
-  
-  protected Object getValue() {
+
+  private Object getValue() {
     return Long.valueOf(Long.MAX_VALUE);
   }
 
-  protected StoredObject createValueAsUnserializedStoredObject(Object value) {
+  private StoredObject createValueAsUnserializedStoredObject(Object value) {
     StoredObject createdObject = createValueAsUnserializedStoredObject(value, false);
     return createdObject;
   }
-  protected StoredObject createValueAsUnserializedStoredObject(Object value, boolean isCompressed) {
+
+  private StoredObject createValueAsUnserializedStoredObject(Object value, boolean isCompressed) {
     byte[] valueInByteArray;
     if (value instanceof Long) {
       valueInByteArray = convertValueToByteArray(value);
@@ -122,12 +108,12 @@ public class MemoryBlockNodeJUnitTest {
   }
 
 
-  protected StoredObject createValueAsSerializedStoredObject(Object value) {
+  private StoredObject createValueAsSerializedStoredObject(Object value) {
     StoredObject createdObject = createValueAsSerializedStoredObject(value, false);
     return createdObject;
   }
-  
-  protected StoredObject createValueAsSerializedStoredObject(Object value, boolean isCompressed) {
+
+  private StoredObject createValueAsSerializedStoredObject(Object value, boolean isCompressed) {
     byte[] valueInSerializedByteArray = EntryEventImpl.serialize(value);
 
     boolean isSerialized = true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryInspectorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryInspectorImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryInspectorImplJUnitTest.java
index b3eb01c..208743f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryInspectorImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryInspectorImplJUnitTest.java
@@ -16,25 +16,24 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-/**
- * Created by sbawaskar on 1/15/16.
- */
 @Category(UnitTest.class)
 public class MemoryInspectorImplJUnitTest {
+
   private FreeListManager freeList;
   private MemoryInspector inspector;
+
   @Before
   public void setUp() {
     this.freeList = mock(FreeListManager.class);
@@ -55,6 +54,7 @@ public class MemoryInspectorImplJUnitTest {
   public void getAllocatedBlocksBeforeCreateSnapshotReturnsEmptyList() {
     assertTrue(inspector.getAllocatedBlocks().isEmpty());
   }
+
   @Test
   public void getFirstBlockBeforeCreateSnapshotReturnsNull() {
     assertNull(inspector.getFirstBlock());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
index 595e132..6a9be63 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
@@ -31,15 +31,13 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
 import com.gemstone.gemfire.internal.cache.VMCachedDeserializable;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
-/**
- */
 @Category(UnitTest.class)
 public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
 
-  private StoredObject storedObject                 = null;
-  private Object                  deserializedRegionEntryValue = null;
-  private byte[]                  serializedRegionEntryValue   = null;
-  private MemoryAllocator         ma;
+  private StoredObject storedObject = null;
+  private Object deserializedRegionEntryValue = null;
+  private byte[] serializedRegionEntryValue   = null;
+  private MemoryAllocator ma;
 
   @Before
   public void setUp() {
@@ -47,7 +45,6 @@ public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
     OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class);
 
     ma = MemoryAllocatorImpl.create(ooohml, stats, 3, OffHeapStorage.MIN_SLAB_SIZE * 3, OffHeapStorage.MIN_SLAB_SIZE);
-
   }
 
   /**
@@ -79,7 +76,7 @@ public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
   }
 
   @Override
-  public byte[] getValueAsByteArray() {
+  protected byte[] getValueAsByteArray() {
     return convertValueToByteArray(getValue());
   }
 
@@ -88,12 +85,12 @@ public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
   }
 
   @Override
-  public Object convertByteArrayToObject(byte[] valueInByteArray) {
+  protected Object convertByteArrayToObject(byte[] valueInByteArray) {
     return ByteBuffer.wrap(valueInByteArray).getLong();
   }
 
   @Override
-  public Object convertSerializedByteArrayToObject(byte[] valueInSerializedByteArray) {
+  protected Object convertSerializedByteArrayToObject(byte[] valueInSerializedByteArray) {
     return EntryEventImpl.deserialize(valueInSerializedByteArray);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index 5cb6afb..2f33927 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -16,13 +16,8 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.nio.ByteBuffer;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStorageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStorageJUnitTest.java
index 77b1d8d..2836a38 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStorageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStorageJUnitTest.java
@@ -16,14 +16,9 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -40,37 +35,34 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class OffHeapStorageJUnitTest {
-  @Rule
-  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
 
   private final static long MEGABYTE = 1024 * 1024;
   private final static long GIGABYTE = 1024 * 1024 * 1024;
 
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @After
-  public void tearDown() throws Exception {
-  }
+  @Rule
+  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
 
   @Test
   public void testParseOffHeapMemorySizeNegative() {
     assertEquals(0, OffHeapStorage.parseOffHeapMemorySize("-1"));
   }
+
   @Test
   public void testParseOffHeapMemorySizeNull() {
     assertEquals(0, OffHeapStorage.parseOffHeapMemorySize(null));
   }
+
   @Test
   public void testParseOffHeapMemorySizeEmpty() {
     assertEquals(0, OffHeapStorage.parseOffHeapMemorySize(""));
   }
+
   @Test
   public void testParseOffHeapMemorySizeBytes() {
     assertEquals(MEGABYTE, OffHeapStorage.parseOffHeapMemorySize("1"));
     assertEquals(Integer.MAX_VALUE * MEGABYTE, OffHeapStorage.parseOffHeapMemorySize("" + Integer.MAX_VALUE));
   }
+
   @Test
   public void testParseOffHeapMemorySizeKiloBytes() {
     try {
@@ -80,32 +72,35 @@ public class OffHeapStorageJUnitTest {
       // Expected
     }
   }
+
   @Test
   public void testParseOffHeapMemorySizeMegaBytes() {
     assertEquals(MEGABYTE, OffHeapStorage.parseOffHeapMemorySize("1m"));
     assertEquals(Integer.MAX_VALUE * MEGABYTE, OffHeapStorage.parseOffHeapMemorySize("" + Integer.MAX_VALUE + "m"));
   }
+
   @Test
   public void testParseOffHeapMemorySizeGigaBytes() {
     assertEquals(GIGABYTE, OffHeapStorage.parseOffHeapMemorySize("1g"));
     assertEquals(Integer.MAX_VALUE * GIGABYTE, OffHeapStorage.parseOffHeapMemorySize("" + Integer.MAX_VALUE + "g"));
   }
+
   @Test
   public void testCalcMaxSlabSize() {
     assertEquals(100, OffHeapStorage.calcMaxSlabSize(100L));
     assertEquals(Integer.MAX_VALUE, OffHeapStorage.calcMaxSlabSize(Long.MAX_VALUE));
     try {
       System.setProperty("gemfire.OFF_HEAP_SLAB_SIZE", "99");
-      assertEquals(99*1024*1024, OffHeapStorage.calcMaxSlabSize(100L*1024*1024));
+      assertEquals(99 * 1024 * 1024, OffHeapStorage.calcMaxSlabSize(100L * 1024 * 1024));
       assertEquals(88, OffHeapStorage.calcMaxSlabSize(88));
       System.setProperty("gemfire.OFF_HEAP_SLAB_SIZE", "88m");
-      assertEquals(88*1024*1024, OffHeapStorage.calcMaxSlabSize(100L*1024*1024));
+      assertEquals(88 * 1024 * 1024, OffHeapStorage.calcMaxSlabSize(100L * 1024 * 1024));
       System.setProperty("gemfire.OFF_HEAP_SLAB_SIZE", "77M");
-      assertEquals(77*1024*1024, OffHeapStorage.calcMaxSlabSize(100L*1024*1024));
+      assertEquals(77 * 1024 * 1024, OffHeapStorage.calcMaxSlabSize(100L * 1024 * 1024));
       System.setProperty("gemfire.OFF_HEAP_SLAB_SIZE", "1g");
-      assertEquals(1*1024*1024*1024, OffHeapStorage.calcMaxSlabSize(2L*1024*1024*1024));
+      assertEquals(1 * 1024 * 1024 * 1024, OffHeapStorage.calcMaxSlabSize(2L * 1024 * 1024 * 1024));
       System.setProperty("gemfire.OFF_HEAP_SLAB_SIZE", "1G");
-      assertEquals(1L*1024*1024*1024, OffHeapStorage.calcMaxSlabSize(2L*1024*1024*1024+1));
+      assertEquals(1L * 1024 * 1024 * 1024, OffHeapStorage.calcMaxSlabSize(2L * 1024 * 1024 * 1024 + 1));
       System.setProperty("gemfire.OFF_HEAP_SLAB_SIZE", "foobarG");
       try {
         OffHeapStorage.calcMaxSlabSize(100);
@@ -119,34 +114,38 @@ public class OffHeapStorageJUnitTest {
       System.clearProperty("gemfire.OFF_HEAP_SLAB_SIZE");
     }
   }
+
   @Test
   public void createOffHeapStorageReturnsNullIfForceLocator() {
     System.setProperty(InternalLocator.FORCE_LOCATOR_DM_TYPE, "true");
     assertEquals(null, OffHeapStorage.createOffHeapStorage(null, 1, null));
   }
+
   @Test
   public void createOffHeapStorageReturnsNullIfMemorySizeIsZero() {
     assertEquals(null, OffHeapStorage.createOffHeapStorage(null, 0, null));
   }
+
   @Test
   public void exceptionIfSlabCountTooSmall() {
     StatisticsFactory statsFactory = mock(StatisticsFactory.class);
     try {
-      OffHeapStorage.createOffHeapStorage(statsFactory, OffHeapStorage.MIN_SLAB_SIZE-1, null);
+      OffHeapStorage.createOffHeapStorage(statsFactory, OffHeapStorage.MIN_SLAB_SIZE - 1, null);
     } catch (IllegalArgumentException expected) {
-      expected.getMessage().equals("The amount of off heap memory must be at least " + OffHeapStorage.MIN_SLAB_SIZE + " but it was set to " + (OffHeapStorage.MIN_SLAB_SIZE-1));
+      expected.getMessage().equals("The amount of off heap memory must be at least " + OffHeapStorage.MIN_SLAB_SIZE + " but it was set to " + (OffHeapStorage.MIN_SLAB_SIZE - 1));
     }
   }
+
   @Test
   public void exceptionIfDistributedSystemNull() {
     StatisticsFactory statsFactory = mock(StatisticsFactory.class);
     try {
-      OffHeapStorage.createOffHeapStorage(statsFactory, OffHeapStorage.MIN_SLAB_SIZE, (DistributedSystem)null);
+      OffHeapStorage.createOffHeapStorage(statsFactory, OffHeapStorage.MIN_SLAB_SIZE, (DistributedSystem) null);
     } catch (IllegalArgumentException expected) {
       expected.getMessage().equals("InternalDistributedSystem is null");
     }
   }
-  
+
   @Test
   public void createOffHeapStorageWorks() {
     StatisticsFactory localStatsFactory = new LocalStatisticsFactory(null);
@@ -160,30 +159,30 @@ public class OffHeapStorageJUnitTest {
   public void testCreateOffHeapStorage() {
     StatisticsFactory localStatsFactory = new LocalStatisticsFactory(null);
     OutOfOffHeapMemoryListener ooohml = mock(OutOfOffHeapMemoryListener.class);
-    MemoryAllocator ma = OffHeapStorage.basicCreateOffHeapStorage(localStatsFactory, 1024*1024, ooohml);
+    MemoryAllocator ma = OffHeapStorage.basicCreateOffHeapStorage(localStatsFactory, 1024 * 1024, ooohml);
     try {
       OffHeapMemoryStats stats = ma.getStats();
       assertNotNull(stats.getStats());
-      assertEquals(1024*1024, stats.getFreeMemory());
-      assertEquals(1024*1024, stats.getMaxMemory());
+      assertEquals(1024 * 1024, stats.getFreeMemory());
+      assertEquals(1024 * 1024, stats.getMaxMemory());
       assertEquals(0, stats.getUsedMemory());
       assertEquals(0, stats.getDefragmentations());
       assertEquals(0, stats.getDefragmentationTime());
       assertEquals(0, stats.getFragmentation());
       assertEquals(1, stats.getFragments());
-      assertEquals(1024*1024, stats.getLargestFragment());
+      assertEquals(1024 * 1024, stats.getLargestFragment());
       assertEquals(0, stats.getObjects());
       assertEquals(0, stats.getReads());
 
       stats.incFreeMemory(100);
-      assertEquals(1024*1024+100, stats.getFreeMemory());
+      assertEquals(1024 * 1024 + 100, stats.getFreeMemory());
       stats.incFreeMemory(-100);
-      assertEquals(1024*1024, stats.getFreeMemory());
+      assertEquals(1024 * 1024, stats.getFreeMemory());
 
       stats.incMaxMemory(100);
-      assertEquals(1024*1024+100, stats.getMaxMemory());
+      assertEquals(1024 * 1024 + 100, stats.getMaxMemory());
       stats.incMaxMemory(-100);
-      assertEquals(1024*1024, stats.getMaxMemory());
+      assertEquals(1024 * 1024, stats.getMaxMemory());
 
       stats.incUsedMemory(100);
       assertEquals(100, stats.getUsedMemory());
@@ -210,8 +209,8 @@ public class OffHeapStorageJUnitTest {
 
       stats.setLargestFragment(100);
       assertEquals(100, stats.getLargestFragment());
-      stats.setLargestFragment(1024*1024);
-      assertEquals(1024*1024, stats.getLargestFragment());
+      stats.setLargestFragment(1024 * 1024);
+      assertEquals(1024 * 1024, stats.getLargestFragment());
 
       boolean originalEnableClockStats = DistributionStats.enableClockStats;
       DistributionStats.enableClockStats = true;
@@ -245,14 +244,14 @@ public class OffHeapStorageJUnitTest {
 
       OutOfOffHeapMemoryException ex = null;
       try {
-        ma.allocate(1024*1024+1);
+        ma.allocate(1024 * 1024 + 1);
         fail("expected OutOfOffHeapMemoryException");
       } catch (OutOfOffHeapMemoryException expected) {
         ex = expected;
       }
       verify(ooohml).outOfOffHeapMemory(ex);
       try {
-        ma.allocate(1024*1024+1);
+        ma.allocate(1024 * 1024 + 1);
         fail("expected OutOfOffHeapMemoryException");
       } catch (OutOfOffHeapMemoryException expected) {
         ex = expected;
@@ -268,16 +267,17 @@ public class OffHeapStorageJUnitTest {
       }
     }
   }
+
   @Test
   public void testCalcSlabCount() {
     final long MSS = OffHeapStorage.MIN_SLAB_SIZE;
-    assertEquals(100, OffHeapStorage.calcSlabCount(MSS*4, MSS*4*100));
-    assertEquals(100, OffHeapStorage.calcSlabCount(MSS*4, (MSS*4*100) + (MSS-1)));
-    assertEquals(101, OffHeapStorage.calcSlabCount(MSS*4, (MSS*4*100) + MSS));
+    assertEquals(100, OffHeapStorage.calcSlabCount(MSS * 4, MSS * 4 * 100));
+    assertEquals(100, OffHeapStorage.calcSlabCount(MSS * 4, (MSS * 4 * 100) + (MSS - 1)));
+    assertEquals(101, OffHeapStorage.calcSlabCount(MSS * 4, (MSS * 4 * 100) + MSS));
     assertEquals(Integer.MAX_VALUE, OffHeapStorage.calcSlabCount(MSS, MSS * Integer.MAX_VALUE));
-    assertEquals(Integer.MAX_VALUE, OffHeapStorage.calcSlabCount(MSS, (MSS * Integer.MAX_VALUE) + MSS-1));
+    assertEquals(Integer.MAX_VALUE, OffHeapStorage.calcSlabCount(MSS, (MSS * Integer.MAX_VALUE) + MSS - 1));
     try {
-      OffHeapStorage.calcSlabCount(MSS, (((long)MSS) * Integer.MAX_VALUE) + MSS);
+      OffHeapStorage.calcSlabCount(MSS, (((long) MSS) * Integer.MAX_VALUE) + MSS);
       fail("Expected IllegalArgumentException");
     } catch (IllegalArgumentException expected) {
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
index 1d19854..a6f7f07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
@@ -20,11 +20,6 @@ import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import org.apache.logging.log4j.Logger;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.listeners.InvocationListener;
@@ -34,25 +29,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class OffHeapStoredObjectAddressStackJUnitTest {
-  static {
-    ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
-  }
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-  }
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @After
-  public void tearDown() throws Exception {
-  }
 
   @Test
   public void addressZeroCausesStackToBeEmpty() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectJUnitTest.java
index 85c8d4c..23d72f5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -14,21 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.offheap;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -54,10 +44,6 @@ public class OffHeapStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
 
   private MemoryAllocator ma;
 
-  static {
-    ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Before
   public void setUp() {
     OutOfOffHeapMemoryListener ooohml = mock(OutOfOffHeapMemoryListener.class);



Mime
View raw message