You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2016/05/24 18:53:44 UTC
[03/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
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index 1f919bc..1d41279 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -26,6 +26,15 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
+import org.apache.logging.log4j.Logger;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.DiskStore;
@@ -49,16 +58,6 @@ import com.gemstone.gemfire.management.internal.cli.domain.DiskStoreDetails;
import com.gemstone.gemfire.management.internal.cli.util.DiskStoreNotFoundException;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.apache.logging.log4j.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-
/**
* The DescribeDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of the
* DescribeDiskStoreFunction class.
@@ -92,7 +91,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
mockContext = null;
}
- protected void assertAsyncEventQueueDetails(final Set<DiskStoreDetails.AsyncEventQueueDetails> expectedAsyncEventQueueDetailsSet, final DiskStoreDetails diskStoreDetails) {
+ private void assertAsyncEventQueueDetails(final Set<DiskStoreDetails.AsyncEventQueueDetails> expectedAsyncEventQueueDetailsSet, final DiskStoreDetails diskStoreDetails) {
int actualCount = 0;
for (final DiskStoreDetails.AsyncEventQueueDetails actualAsyncEventQueueDetails : diskStoreDetails.iterateAsyncEventQueues()) {
@@ -109,7 +108,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertEquals(expectedAsyncEventQueueDetailsSet.size(), actualCount);
}
- protected void assertCacheServerDetails(final Set<DiskStoreDetails.CacheServerDetails> expectedCacheServerDetailsSet, final DiskStoreDetails diskStoreDetails) {
+ private void assertCacheServerDetails(final Set<DiskStoreDetails.CacheServerDetails> expectedCacheServerDetailsSet, final DiskStoreDetails diskStoreDetails) {
int actualCount = 0;
for (final DiskStoreDetails.CacheServerDetails actualCacheServerDetails : diskStoreDetails.iterateCacheServers()) {
@@ -129,7 +128,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertEquals(expectedCacheServerDetailsSet.size(), actualCount);
}
- protected void assertGatewayDetails(final Set<DiskStoreDetails.GatewayDetails> expectedGatewayDetailsSet, final DiskStoreDetails diskStoreDetails) {
+ private void assertGatewayDetails(final Set<DiskStoreDetails.GatewayDetails> expectedGatewayDetailsSet, final DiskStoreDetails diskStoreDetails) {
int actualCount = 0;
for (final DiskStoreDetails.GatewayDetails actualGatewayDetails : diskStoreDetails.iterateGateways()) {
@@ -148,7 +147,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertEquals(expectedGatewayDetailsSet.size(), actualCount);
}
- protected void assertRegionDetails(final Set<DiskStoreDetails.RegionDetails> expectedRegionDetailsSet, final DiskStoreDetails diskStoreDetails) {
+ private void assertRegionDetails(final Set<DiskStoreDetails.RegionDetails> expectedRegionDetailsSet, final DiskStoreDetails diskStoreDetails) {
int actualCount = 0;
for (final DiskStoreDetails.RegionDetails actualRegionDetails : diskStoreDetails.iterateRegions()) {
@@ -169,11 +168,11 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertEquals(expectedRegionDetailsSet.size(), actualCount);
}
- protected DiskStoreDetails.AsyncEventQueueDetails createAsyncEventQueueDetails(final String id) {
+ private DiskStoreDetails.AsyncEventQueueDetails createAsyncEventQueueDetails(final String id) {
return new DiskStoreDetails.AsyncEventQueueDetails(id);
}
- protected DiskStoreDetails.CacheServerDetails createCacheServerDetails(final String bindAddress,
+ private DiskStoreDetails.CacheServerDetails createCacheServerDetails(final String bindAddress,
final int port,
final String hostname)
{
@@ -182,11 +181,11 @@ public class DescribeDiskStoreFunctionJUnitTest {
return cacheServerDetails;
}
- protected DescribeDiskStoreFunction createDescribeDiskStoreFunction(final Cache cache) {
+ private DescribeDiskStoreFunction createDescribeDiskStoreFunction(final Cache cache) {
return new TestDescribeDiskStoreFunction(cache);
}
- protected File[] createFileArray(final String... locations) {
+ private File[] createFileArray(final String... locations) {
assert locations != null : "The locations argument cannot be null!";
final File[] directories = new File[locations.length];
@@ -199,18 +198,18 @@ public class DescribeDiskStoreFunctionJUnitTest {
return directories;
}
- protected DiskStoreDetails.GatewayDetails createGatewayDetails(final String id, final boolean persistent) {
+ private DiskStoreDetails.GatewayDetails createGatewayDetails(final String id, final boolean persistent) {
DiskStoreDetails.GatewayDetails gatewayDetails = new DiskStoreDetails.GatewayDetails(id);
gatewayDetails.setPersistent(persistent);
return gatewayDetails;
}
- protected int[] createIntArray(final int... array) {
+ private int[] createIntArray(final int... array) {
assert array != null : "The array of int values cannot be null!";
return array;
}
- protected DiskStore createMockDiskStore(final UUID diskStoreId,
+ private DiskStore createMockDiskStore(final UUID diskStoreId,
final String name,
final boolean allowForceCompaction,
final boolean autoCompact,
@@ -258,7 +257,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
return mockDiskStore;
}
- protected DiskStoreDetails.RegionDetails createRegionDetails(final String fullPath,
+ private DiskStoreDetails.RegionDetails createRegionDetails(final String fullPath,
final String name,
final boolean persistent,
final boolean overflow)
@@ -285,7 +284,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
}
}
- protected void setupEmptyRegionsPdxGatewaysCacheServersAndAsyncEventQueues(final InternalCache mockCache) {
+ private void setupEmptyRegionsPdxGatewaysCacheServersAndAsyncEventQueues(final InternalCache mockCache) {
mockContext.checking(new Expectations() {{
oneOf(mockCache).rootRegions();
will(returnValue(Collections.emptySet()));
@@ -301,7 +300,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
}});
}
- protected Set<DiskStoreDetails.RegionDetails> setupRegionsForTestExecute(final InternalCache mockCache, final String diskStoreName) {
+ private Set<DiskStoreDetails.RegionDetails> setupRegionsForTestExecute(final InternalCache mockCache, final String diskStoreName) {
final Region mockUserRegion = mockContext.mock(Region.class, "/UserRegion");
final Region mockSessionRegion = mockContext.mock(Region.class, "/UserRegion/SessionRegion");
final Region mockGuestRegion = mockContext.mock(Region.class, "/GuestRegion");
@@ -367,7 +366,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
createRegionDetails("/UserRegion/SessionRegion", "SessionRegion", false, true));
}
- protected Set<DiskStoreDetails.GatewayDetails> setupGatewaysForTestExecute(final InternalCache mockCache, final String diskStoreName) {
+ private Set<DiskStoreDetails.GatewayDetails> setupGatewaysForTestExecute(final InternalCache mockCache, final String diskStoreName) {
final GatewaySender mockGatewaySender = mockContext.mock(GatewaySender.class, "GatewaySender");
mockContext.checking(new Expectations() {{
@@ -418,7 +417,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
return CollectionUtils.asSet(createCacheServerDetails("10.127.0.1", 10123, "rodan"));
}
- protected Set<DiskStoreDetails.AsyncEventQueueDetails> setupAsyncEventQueuesForTestExecute(final InternalCache mockCache, final String diskStoreName) {
+ private Set<DiskStoreDetails.AsyncEventQueueDetails> setupAsyncEventQueuesForTestExecute(final InternalCache mockCache, final String diskStoreName) {
final AsyncEventQueue mockAsyncEventQueue1 = mockContext.mock(AsyncEventQueue.class, "AsyncEventQueue1");
final AsyncEventQueue mockAsyncEventQueue2 = mockContext.mock(AsyncEventQueue.class, "AsyncEventQueue2");
final AsyncEventQueue mockAsyncEventQueue3 = mockContext.mock(AsyncEventQueue.class, "AsyncEventQueue3");
@@ -444,7 +443,6 @@ public class DescribeDiskStoreFunctionJUnitTest {
}
@Test
- @Ignore("Removing the old WAN broke this method. Unignore when merged")
public void testExecute() throws Throwable {
final UUID diskStoreId = UUID.randomUUID();
@@ -1410,7 +1408,6 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertTrue(function.isUsingDiskStore(mockGatewaySender, mockDiskStore));
}
-
@Test
public void testSetPdxSerializationDetails() {
final String diskStoreName = "testDiskStore";
@@ -1532,6 +1529,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertTrue(function.isUsingDiskStore(mockQueue, mockDiskStore));
}
+
@Test
public void testIsAsyncEventQueueUsingDiskStoreWhenDiskStoresMismatch() {
final AsyncEventQueue mockQueue = mockContext.mock(AsyncEventQueue.class, "AsyncEventQueue");
@@ -1633,7 +1631,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
assertAsyncEventQueueDetails(expectedAsyncEventQueueDetails, diskStoreDetails);
}
- protected static class TestDescribeDiskStoreFunction extends DescribeDiskStoreFunction {
+ private static class TestDescribeDiskStoreFunction extends DescribeDiskStoreFunction {
private final Cache cache;
@@ -1641,12 +1639,13 @@ public class DescribeDiskStoreFunctionJUnitTest {
this.cache = cache;
}
- @Override protected Cache getCache() {
+ @Override
+ protected Cache getCache() {
return this.cache;
}
}
- protected static class TestResultSender implements ResultSender {
+ private static class TestResultSender implements ResultSender {
private final List<Object> results = new LinkedList<Object>();
@@ -1659,14 +1658,17 @@ public class DescribeDiskStoreFunctionJUnitTest {
return Collections.unmodifiableList(results);
}
+ @Override
public void lastResult(final Object lastResult) {
results.add(lastResult);
}
+ @Override
public void sendResult(final Object oneResult) {
results.add(oneResult);
}
+ @Override
public void sendException(final Throwable t) {
this.t = t;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index 2e48dea..ff34701 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -27,6 +27,14 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.execute.FunctionContext;
@@ -37,14 +45,6 @@ import com.gemstone.gemfire.internal.cache.InternalCache;
import com.gemstone.gemfire.management.internal.cli.domain.DiskStoreDetails;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
/**
* The ListDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of the
* ListDiskStoresFunction.
@@ -76,14 +76,14 @@ public class ListDiskStoresFunctionJUnitTest {
mockContext = null;
}
- protected DiskStoreDetails createDiskStoreDetails(final UUID id,
+ private DiskStoreDetails createDiskStoreDetails(final UUID id,
final String name,
final String memberName,
final String memberId) {
return new DiskStoreDetails(id, name, memberId, memberName);
}
- protected ListDiskStoresFunction createListDiskStoresFunction(final Cache cache) {
+ private ListDiskStoresFunction createListDiskStoresFunction(final Cache cache) {
return new TestListDiskStoresFunction(cache);
}
@@ -284,7 +284,7 @@ public class ListDiskStoresFunctionJUnitTest {
}
}
- protected static class TestListDiskStoresFunction extends ListDiskStoresFunction {
+ private static class TestListDiskStoresFunction extends ListDiskStoresFunction {
private final Cache cache;
@@ -293,12 +293,13 @@ public class ListDiskStoresFunctionJUnitTest {
this.cache = cache;
}
- @Override protected Cache getCache() {
+ @Override
+ protected Cache getCache() {
return cache;
}
}
- protected static class TestResultSender implements ResultSender {
+ private static class TestResultSender implements ResultSender {
private final List<Object> results = new LinkedList<Object>();
@@ -311,14 +312,17 @@ public class ListDiskStoresFunctionJUnitTest {
return Collections.unmodifiableList(results);
}
+ @Override
public void lastResult(final Object lastResult) {
results.add(lastResult);
}
+ @Override
public void sendResult(final Object oneResult) {
results.add(oneResult);
}
+ @Override
public void sendException(final Throwable t) {
this.t = t;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index 413d0ac..ff7a7ad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -26,6 +26,14 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.FunctionContext;
@@ -43,15 +51,6 @@ import com.gemstone.gemfire.management.internal.cli.domain.IndexDetails;
import com.gemstone.gemfire.management.internal.cli.domain.IndexDetails.IndexStatisticsDetails;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
/**
* The ListIndexFunctionJUnitTest class is test suite of test cases testing the contract and functionality of the
* ListIndexFunction GemFire function.
@@ -68,15 +67,15 @@ import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class ListIndexFunctionJUnitTest {
- private AtomicLong mockCounter = new AtomicLong(0l);
-
private Mockery mockContext;
+ private AtomicLong mockCounter;
@Before
public void setup() {
mockContext = new Mockery() {{
setImposteriser(ClassImposteriser.INSTANCE);
}};
+ mockCounter = new AtomicLong(0l);
}
@After
@@ -85,38 +84,34 @@ public class ListIndexFunctionJUnitTest {
mockContext = null;
}
- protected void assertEquals(final IndexDetails expectedIndexDetails, final IndexDetails actualIndexDetails) {
- Assert.assertEquals(expectedIndexDetails.getFromClause(), actualIndexDetails.getFromClause());
- Assert.assertEquals(expectedIndexDetails.getIndexedExpression(), actualIndexDetails.getIndexedExpression());
- Assert.assertEquals(expectedIndexDetails.getIndexName(), actualIndexDetails.getIndexName());
- assertEquals(expectedIndexDetails.getIndexStatisticsDetails(), actualIndexDetails.getIndexStatisticsDetails());
- Assert.assertEquals(expectedIndexDetails.getIndexType(), actualIndexDetails.getIndexType());
- Assert.assertEquals(expectedIndexDetails.getMemberId(), actualIndexDetails.getMemberId());
- Assert.assertEquals(expectedIndexDetails.getMemberName(), actualIndexDetails.getMemberName());
- Assert.assertEquals(expectedIndexDetails.getProjectionAttributes(), actualIndexDetails.getProjectionAttributes());
- Assert.assertEquals(expectedIndexDetails.getRegionName(), actualIndexDetails.getRegionName());
- Assert.assertEquals(expectedIndexDetails.getRegionPath(), actualIndexDetails.getRegionPath());
+ private void assertIndexDetailsEquals(final IndexDetails expectedIndexDetails, final IndexDetails actualIndexDetails) {
+ assertEquals(expectedIndexDetails.getFromClause(), actualIndexDetails.getFromClause());
+ assertEquals(expectedIndexDetails.getIndexedExpression(), actualIndexDetails.getIndexedExpression());
+ assertEquals(expectedIndexDetails.getIndexName(), actualIndexDetails.getIndexName());
+ assertIndexStatisticsDetailsEquals(expectedIndexDetails.getIndexStatisticsDetails(), actualIndexDetails.getIndexStatisticsDetails());
+ assertEquals(expectedIndexDetails.getIndexType(), actualIndexDetails.getIndexType());
+ assertEquals(expectedIndexDetails.getMemberId(), actualIndexDetails.getMemberId());
+ assertEquals(expectedIndexDetails.getMemberName(), actualIndexDetails.getMemberName());
+ assertEquals(expectedIndexDetails.getProjectionAttributes(), actualIndexDetails.getProjectionAttributes());
+ assertEquals(expectedIndexDetails.getRegionName(), actualIndexDetails.getRegionName());
+ assertEquals(expectedIndexDetails.getRegionPath(), actualIndexDetails.getRegionPath());
}
- protected void assertEquals(final IndexStatisticsDetails expectedIndexStatisticsDetails, final IndexStatisticsDetails actualIndexStatisticsDetails) {
+ private void assertIndexStatisticsDetailsEquals(final IndexStatisticsDetails expectedIndexStatisticsDetails, final IndexStatisticsDetails actualIndexStatisticsDetails) {
if (expectedIndexStatisticsDetails != null) {
assertNotNull(actualIndexStatisticsDetails);
- Assert.assertEquals(expectedIndexStatisticsDetails.getNumberOfKeys(), actualIndexStatisticsDetails
- .getNumberOfKeys());
- Assert.assertEquals(expectedIndexStatisticsDetails.getNumberOfUpdates(), actualIndexStatisticsDetails
- .getNumberOfUpdates());
- Assert.assertEquals(expectedIndexStatisticsDetails.getNumberOfValues(), actualIndexStatisticsDetails
- .getNumberOfValues());
- Assert.assertEquals(expectedIndexStatisticsDetails.getTotalUpdateTime(), actualIndexStatisticsDetails
- .getTotalUpdateTime());
- Assert.assertEquals(expectedIndexStatisticsDetails.getTotalUses(), actualIndexStatisticsDetails.getTotalUses());
- }
- else {
+ assertEquals(expectedIndexStatisticsDetails.getNumberOfKeys(), actualIndexStatisticsDetails.getNumberOfKeys());
+ assertEquals(expectedIndexStatisticsDetails.getNumberOfUpdates(), actualIndexStatisticsDetails.getNumberOfUpdates());
+ assertEquals(expectedIndexStatisticsDetails.getNumberOfValues(), actualIndexStatisticsDetails.getNumberOfValues());
+ assertEquals(expectedIndexStatisticsDetails.getTotalUpdateTime(), actualIndexStatisticsDetails.getTotalUpdateTime());
+ assertEquals(expectedIndexStatisticsDetails.getTotalUses(), actualIndexStatisticsDetails.getTotalUses());
+
+ } else {
assertNull(actualIndexStatisticsDetails);
}
}
- protected IndexDetails createIndexDetails(final String memberId,
+ private IndexDetails createIndexDetails(final String memberId,
final String regionPath,
final String indexName,
final IndexType indexType,
@@ -124,8 +119,7 @@ public class ListIndexFunctionJUnitTest {
final String indexedExpression,
final String memberName,
final String projectionAttributes,
- final String regionName)
- {
+ final String regionName) {
final IndexDetails indexDetails = new IndexDetails(memberId, regionPath, indexName);
indexDetails.setFromClause(fromClause);
@@ -138,12 +132,11 @@ public class ListIndexFunctionJUnitTest {
return indexDetails;
}
- protected IndexStatisticsDetails createIndexStatisticsDetails(final Long numberOfKeys,
+ private IndexStatisticsDetails createIndexStatisticsDetails(final Long numberOfKeys,
final Long numberOfUpdates,
final Long numberOfValues,
final Long totalUpdateTime,
- final Long totalUses)
- {
+ final Long totalUses) {
final IndexStatisticsDetails indexStatisticsDetails = new IndexStatisticsDetails();
indexStatisticsDetails.setNumberOfKeys(numberOfKeys);
@@ -155,16 +148,14 @@ public class ListIndexFunctionJUnitTest {
return indexStatisticsDetails;
}
- protected ListIndexFunction createListIndexFunction(final Cache cache) {
+ private ListIndexFunction createListIndexFunction(final Cache cache) {
return new TestListIndexFunction(cache);
}
- protected Index createMockIndex(final IndexDetails indexDetails) {
- final Index mockIndex = mockContext.mock(Index.class, "Index " + indexDetails.getIndexName() + " "
- + mockCounter.getAndIncrement());
+ private Index createMockIndex(final IndexDetails indexDetails) {
+ final Index mockIndex = mockContext.mock(Index.class, "Index " + indexDetails.getIndexName() + " " + mockCounter.getAndIncrement());
- final Region mockRegion = mockContext.mock(Region.class, "Region " + indexDetails.getRegionPath() + " "
- + mockCounter.getAndIncrement());
+ final Region mockRegion = mockContext.mock(Region.class, "Region " + indexDetails.getRegionPath() + " " + mockCounter.getAndIncrement());
mockContext.checking(new Expectations() {{
oneOf(mockIndex).getFromClause();
@@ -186,8 +177,7 @@ public class ListIndexFunctionJUnitTest {
}});
if (indexDetails.getIndexStatisticsDetails() != null) {
- final IndexStatistics mockIndexStatistics = mockContext.mock(IndexStatistics.class, "IndexStatistics "
- + indexDetails.getIndexName() + " " + mockCounter.getAndIncrement());
+ final IndexStatistics mockIndexStatistics = mockContext.mock(IndexStatistics.class, "IndexStatistics " + indexDetails.getIndexName() + " " + mockCounter.getAndIncrement());
mockContext.checking(new Expectations() {{
exactly(2).of(mockIndex).getStatistics();
@@ -203,8 +193,8 @@ public class ListIndexFunctionJUnitTest {
oneOf(mockIndexStatistics).getTotalUses();
will(returnValue(indexDetails.getIndexStatisticsDetails().getTotalUses()));
}});
- }
- else {
+
+ } else {
mockContext.checking(new Expectations() {{
oneOf(mockIndex).getStatistics();
will(returnValue(null));
@@ -214,7 +204,7 @@ public class ListIndexFunctionJUnitTest {
return mockIndex;
}
- protected IndexType getIndexType(final IndexDetails.IndexType type) {
+ private IndexType getIndexType(final IndexDetails.IndexType type) {
switch (type) {
case FUNCTIONAL:
return IndexType.FUNCTIONAL;
@@ -289,12 +279,12 @@ public class ListIndexFunctionJUnitTest {
final List<?> results = testResultSender.getResults();
assertNotNull(results);
- Assert.assertEquals(1, results.size());
+ assertEquals(1, results.size());
final Set<IndexDetails> actualIndexDetailsSet = (Set<IndexDetails>) results.get(0);
assertNotNull(actualIndexDetailsSet);
- Assert.assertEquals(expectedIndexDetailsSet.size(), actualIndexDetailsSet.size());
+ assertEquals(expectedIndexDetailsSet.size(), actualIndexDetailsSet.size());
for (final IndexDetails expectedIndexDetails : expectedIndexDetailsSet) {
final IndexDetails actualIndexDetails = CollectionUtils.findBy(actualIndexDetailsSet, new Filter<IndexDetails>() {
@@ -304,7 +294,7 @@ public class ListIndexFunctionJUnitTest {
});
assertNotNull(actualIndexDetails);
- assertEquals(expectedIndexDetails, actualIndexDetails);
+ assertIndexDetailsEquals(expectedIndexDetails, actualIndexDetails);
}
}
@@ -342,7 +332,7 @@ public class ListIndexFunctionJUnitTest {
final List<?> results = testResultSender.getResults();
assertNotNull(results);
- Assert.assertEquals(1, results.size());
+ assertEquals(1, results.size());
final Set<IndexDetails> actualIndexDetailsSet = (Set<IndexDetails>) results.get(0);
@@ -382,15 +372,14 @@ public class ListIndexFunctionJUnitTest {
try {
testResultSender.getResults();
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
assertTrue(t instanceof RuntimeException);
- Assert.assertEquals("expected", t.getMessage());
+ assertEquals("expected", t.getMessage());
throw t;
}
}
- protected static class TestListIndexFunction extends ListIndexFunction {
+ private static class TestListIndexFunction extends ListIndexFunction {
private final Cache cache;
@@ -405,7 +394,7 @@ public class ListIndexFunctionJUnitTest {
}
}
- protected static class TestResultSender implements ResultSender {
+ private static class TestResultSender implements ResultSender {
private final List<Object> results = new LinkedList<Object>();
@@ -418,14 +407,17 @@ public class ListIndexFunctionJUnitTest {
return Collections.unmodifiableList(results);
}
+ @Override
public void lastResult(final Object lastResult) {
results.add(lastResult);
}
+ @Override
public void sendResult(final Object oneResult) {
results.add(oneResult);
}
+ @Override
public void sendException(final Throwable t) {
this.t = t;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtilsJUnitTest.java
index 03d73d3..b4d688c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtilsJUnitTest.java
@@ -16,24 +16,23 @@
*/
package com.gemstone.gemfire.management.internal.cli.parser;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.*;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
-import com.gemstone.gemfire.management.internal.cli.parser.ParserUtils;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Includes tests for all utility methods in {@link ParserUtils}
- *
- *
*/
@Category(UnitTest.class)
-public class ParserUtilsJUnitTest extends TestCase {
+public class ParserUtilsJUnitTest {
/**
* Test for {@link ParserUtils#split(String, String)}
*/
+ @Test
public void testSplit() {
String input = "something::{::}::nothing";
String[] split = ParserUtils.split(input, "::");
@@ -46,6 +45,7 @@ public class ParserUtilsJUnitTest extends TestCase {
/**
* Test for {@link ParserUtils#splitValues(String, String)}
*/
+ @Test
public void testSplitValues() {
String input = "something::{::}::nothing::";
String[] split = ParserUtils.splitValues(input, "::");
@@ -59,6 +59,7 @@ public class ParserUtilsJUnitTest extends TestCase {
/**
* Test for {@link ParserUtils#contains(String, String)}
*/
+ @Test
public void testContains() {
String input = "something::{::}::nothing::";
assertTrue("Check Boolean", ParserUtils.contains(input, "::"));
@@ -69,6 +70,7 @@ public class ParserUtilsJUnitTest extends TestCase {
/**
* Test for {@link ParserUtils#lastIndexOf(String, String)}
*/
+ @Test
public void testLastIndexOf() {
String input = "something::{::}::nothing::";
assertEquals("lastIndex", 24, ParserUtils.lastIndexOf(input, "::"));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorJUnitTest.java
index 5b928e3..2d217cc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorJUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli.parser.preprocessor;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -24,13 +24,10 @@ import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
- *
* Test for Preprocessor
- *
- *
*/
@Category(UnitTest.class)
-public class PreprocessorJUnitTest extends TestCase{
+public class PreprocessorJUnitTest {
@Test
public void test1Arg() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtilsJUnitTest.java
index 2a56747..05be5bb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtilsJUnitTest.java
@@ -16,26 +16,24 @@
*/
package com.gemstone.gemfire.management.internal.cli.parser.preprocessor;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.*;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.internal.lang.SystemUtils;
-import com.gemstone.gemfire.management.internal.cli.parser.preprocessor.PreprocessorUtils;
-import com.gemstone.gemfire.management.internal.cli.parser.preprocessor.TrimmedInput;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Includes tests for all utility methods in {@link PreprocessorUtils}
- *
- *
*/
@Category(UnitTest.class)
-public class PreprocessorUtilsJUnitTest extends TestCase {
+public class PreprocessorUtilsJUnitTest {
/**
* Test for {@link PreprocessorUtils#simpleTrim(String)}
*/
+ @Test
public void testSimpleTrim() {
String input = " 1 2 3 ";
TrimmedInput simpleTrim = PreprocessorUtils.simpleTrim(input);
@@ -51,6 +49,7 @@ public class PreprocessorUtilsJUnitTest extends TestCase {
/**
* Test for {@link PreprocessorUtils#trim(String)}
*/
+ @Test
public void testTrim() {
String input = " command argument1 argument2 ";
TrimmedInput trim = PreprocessorUtils.trim(input);
@@ -86,6 +85,7 @@ public class PreprocessorUtilsJUnitTest extends TestCase {
/**
* Test for {@link PreprocessorUtils#removeWhiteSpaces(String)}
*/
+ @Test
public void testRemoveWhiteSpaces() {
String input = "1 2 3 ";
String output = PreprocessorUtils.removeWhiteSpaces(input);
@@ -95,6 +95,7 @@ public class PreprocessorUtilsJUnitTest extends TestCase {
/**
* Test for {@link PreprocessorUtils#isSyntaxValid(String)}
*/
+ @Test
public void testIsSyntaxValid() {
assertTrue(PreprocessorUtils.isSyntaxValid("{}"));
assertFalse(PreprocessorUtils.isSyntaxValid("{{]}"));
@@ -106,6 +107,7 @@ public class PreprocessorUtilsJUnitTest extends TestCase {
/**
* Test for {@link PreprocessorUtils#containsOnlyWhiteSpaces(String)}
*/
+ @Test
public void testContainsOnlyWhiteSpaces() {
assertTrue(PreprocessorUtils
.containsOnlyWhiteSpaces(" "));
@@ -116,6 +118,7 @@ public class PreprocessorUtilsJUnitTest extends TestCase {
/**
* Test for {@link PreprocessorUtils#isWhitespace(char)}
*/
+ @Test
public void testIsWhitespace() {
assertTrue(PreprocessorUtils.isWhitespace(' '));
assertTrue(PreprocessorUtils.isWhitespace('\t'));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
index bbd1946..81b99c2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
@@ -26,10 +26,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class GfshConfigInitFileJUnitTest {
+
private static final String INIT_FILE_NAME = GfshConfig.DEFAULT_INIT_FILE_NAME;
private static final String INIT_FILE_PROPERTY = GfshConfig.INIT_FILE_PROPERTY;
@@ -65,8 +66,7 @@ public class GfshConfigInitFileJUnitTest {
@Before
public void setUp() throws Exception {
- String userDir = temporaryFolder_CurrentDirectory.getRoot()
- .getAbsolutePath();
+ String userDir = temporaryFolder_CurrentDirectory.getRoot().getAbsolutePath();
String userHome = temporaryFolder_HomeDirectory.getRoot().getAbsolutePath();
System.setProperty("user.dir", userDir);
@@ -82,8 +82,7 @@ public class GfshConfigInitFileJUnitTest {
public void constructorArgumentUsed() throws Exception {
temporaryFolder_HomeDirectory.newFile(INIT_FILE_NAME);
temporaryFolder_CurrentDirectory.newFile(INIT_FILE_NAME);
- System.setProperty(INIT_FILE_PROPERTY, temporaryFolder_AnotherDirectory
- .newFile(INIT_FILE_NAME).getAbsolutePath());
+ System.setProperty(INIT_FILE_PROPERTY, temporaryFolder_AnotherDirectory.newFile(INIT_FILE_NAME).getAbsolutePath());
String argument = temporaryFolder_AnotherDirectory.newFile("junit")
.getAbsolutePath();
@@ -107,8 +106,7 @@ public class GfshConfigInitFileJUnitTest {
public void systemPropertySelectedFirst() throws Exception {
temporaryFolder_HomeDirectory.newFile(INIT_FILE_NAME);
temporaryFolder_CurrentDirectory.newFile(INIT_FILE_NAME);
- String fileName = temporaryFolder_AnotherDirectory.newFile(INIT_FILE_NAME)
- .getAbsolutePath();
+ String fileName = temporaryFolder_AnotherDirectory.newFile(INIT_FILE_NAME).getAbsolutePath();
System.setProperty(INIT_FILE_PROPERTY, fileName);
/*
@@ -129,8 +127,7 @@ public class GfshConfigInitFileJUnitTest {
@Test
public void currentDirectorySelectedSecond() throws Exception {
temporaryFolder_HomeDirectory.newFile(INIT_FILE_NAME);
- String fileName = temporaryFolder_CurrentDirectory.newFile(INIT_FILE_NAME)
- .getAbsolutePath();
+ String fileName = temporaryFolder_CurrentDirectory.newFile(INIT_FILE_NAME).getAbsolutePath();
/*
* String historyFileName, String defaultPrompt, int historySize, String
@@ -149,8 +146,7 @@ public class GfshConfigInitFileJUnitTest {
// Home directory file selected if only one present
@Test
public void homeDirectorySelectedThird() throws Exception {
- String fileName = temporaryFolder_HomeDirectory.newFile(INIT_FILE_NAME)
- .getAbsolutePath();
+ String fileName = temporaryFolder_HomeDirectory.newFile(INIT_FILE_NAME).getAbsolutePath();
/*
* String historyFileName, String defaultPrompt, int historySize, String
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
index 4579178..088a6a1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
@@ -16,6 +16,19 @@
*/
package com.gemstone.gemfire.management.internal.cli.shell;
+import static com.gemstone.gemfire.cache.operations.OperationContext.*;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+import org.springframework.shell.event.ParseResult;
+
import com.gemstone.gemfire.management.cli.CliMetaData;
import com.gemstone.gemfire.management.cli.ConverterHint;
import com.gemstone.gemfire.management.cli.Result;
@@ -25,27 +38,13 @@ import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
import com.gemstone.gemfire.management.internal.security.ResourceOperation;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-import org.springframework.shell.event.ParseResult;
-
-import java.util.List;
-
-import static com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
* GfshExecutionStrategyTest - Includes tests to for GfshExecutionStrategyTest
- *
*/
@Category(UnitTest.class)
public class GfshExecutionStrategyJUnitTest {
+
private static final String COMMAND1_NAME = "command1";
private static final String COMMAND1_NAME_ALIAS = "command1_alias";
private static final String COMMAND2_NAME = "command2";
@@ -58,15 +57,16 @@ public class GfshExecutionStrategyJUnitTest {
CommandManager.clearInstance();
}
- //tests execute method by executing dummy method command1
+ /**
+ * tests execute method by executing dummy method command1
+ */
@Test
public void testGfshExecutionStartegyExecute() throws Exception {
CommandManager commandManager = CommandManager.getInstance();
assertNotNull("CommandManager should not be null.", commandManager);
commandManager.add(Commands.class.newInstance());
GfshParser parser = new GfshParser(commandManager);
- String[] command1Names = ((CliCommand) Commands.class.getMethod(
- COMMAND1_NAME).getAnnotation(CliCommand.class)).value();
+ String[] command1Names = ((CliCommand) Commands.class.getMethod(COMMAND1_NAME).getAnnotation(CliCommand.class)).value();
String input =command1Names[0];
ParseResult parseResult = null;
parseResult = parser.parse(input);
@@ -78,16 +78,17 @@ public class GfshExecutionStrategyJUnitTest {
assertTrue(str.trim().equals(COMMAND1_SUCESS));
}
- //tests isReadyForCommnads method by executing dummy method command1.
- //TODO: this method is hard coded in source which may change in future. So this
- //test should also be accordingly changed
+ /**
+ * tests isReadyForCommnads method by executing dummy method command1.
+ * TODO: this method is hard coded in source which may change in future. So this
+ * test should also be accordingly changed
+ */
@Test
public void testGfshExecutionStartegyIsReadyForCommands() throws Exception {
CommandManager commandManager = CommandManager.getInstance();
assertNotNull("CommandManager should not be null.", commandManager);
commandManager.add(Commands.class.newInstance());
- String[] command1Names = ((CliCommand) Commands.class.getMethod(
- COMMAND1_NAME).getAnnotation(CliCommand.class)).value();
+ String[] command1Names = ((CliCommand) Commands.class.getMethod(COMMAND1_NAME).getAnnotation(CliCommand.class)).value();
String[] args = new String[] {command1Names[0] };
Gfsh gfsh = Gfsh.getInstance(false, args, new GfshConfig());
GfshExecutionStrategy gfshExecutionStrategy = new GfshExecutionStrategy(gfsh);
@@ -95,7 +96,9 @@ public class GfshExecutionStrategyJUnitTest {
assertTrue(ready);
}
- //represents class for dummy methods
+ /**
+ * represents class for dummy methods
+ */
public static class Commands implements CommandMarker {
@CliCommand(value = { COMMAND1_NAME, COMMAND1_NAME_ALIAS }, help = COMMAND1_HELP)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
index b2081d2..cfa9e32 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
@@ -23,8 +23,6 @@ import java.lang.reflect.Field;
import java.nio.file.Files;
import java.util.List;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -32,7 +30,9 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-@Category(UnitTest.class)
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
public class GfshHistoryJUnitTest {
private File gfshHistoryFile;
@@ -81,8 +81,7 @@ public class GfshHistoryJUnitTest {
gfsh.executeScriptLine("connect --password=foo --password = foo --password= goo --password =goo --password-param=blah --other-password-param= gah");
List<String> lines = Files.readAllLines(gfshHistoryFile.toPath());
- assertEquals("// [failed] connect --password=***** --password = ***** --password= ***** --password =***** --password-param=***** --other-password-param= *****",
- lines.get(1));
+ assertEquals("// [failed] connect --password=***** --password = ***** --password= ***** --password =***** --password-param=***** --other-password-param= *****", lines.get(1));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshInitFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshInitFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshInitFileJUnitTest.java
index c0b9348..529336f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshInitFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshInitFileJUnitTest.java
@@ -45,16 +45,14 @@ import com.gemstone.gemfire.management.internal.cli.LogWrapper;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
- * <P>
* Unit tests for supplying an init file to Gfsh.
* </P>
- * <P>
* Makes use of reflection to reset private static variables on some classes to
* replace loggers that would otherwise clutter the console.
- * </P>
*/
@Category(UnitTest.class)
public class GfshInitFileJUnitTest {
+
private static final String INIT_FILE_NAME = GfshConfig.DEFAULT_INIT_FILE_NAME;
private static final boolean APPEND = true;
private static final int BANNER_LINES = 1;
@@ -66,16 +64,17 @@ public class GfshInitFileJUnitTest {
private static java.util.logging.Logger julLogger;
private static Handler[] saveHandlers;
- @ClassRule
- public static TemporaryFolder temporaryFolder_Config = new TemporaryFolder();
- @Rule
- public TemporaryFolder temporaryFolder_CurrentDirectory = new TemporaryFolder();
-
private ByteArrayOutputStream sysout = new ByteArrayOutputStream();
private String gfshHistoryFileName;
private LogWrapper gfshFileLogger;
private JUnitLoggerHandler junitLoggerHandler;
+ @ClassRule
+ public static TemporaryFolder temporaryFolder_Config = new TemporaryFolder();
+
+ @Rule
+ public TemporaryFolder temporaryFolder_CurrentDirectory = new TemporaryFolder();
+
/*
* Turn off console logging from JUL and Log4j2 for the duration of this
* class's tests, to reduce noise level of output in automated build.
@@ -443,13 +442,12 @@ public class GfshInitFileJUnitTest {
}
/**
- * <P>
* Log handler for testing. Capture logged messages for later inspection.
- * </P>
- *
+ *
* @see java.util.logging.Handler#publish(java.util.logging.LogRecord)
*/
- private class JUnitLoggerHandler extends Handler {
+ private static class JUnitLoggerHandler extends Handler {
+
private List<LogRecord> log;
public JUnitLoggerHandler() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/ZipUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/ZipUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/ZipUtilsJUnitTest.java
index 1222aad..595bdeb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/ZipUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/ZipUtilsJUnitTest.java
@@ -16,80 +16,90 @@
*/
package com.gemstone.gemfire.management.internal.configuration;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.io.File;
-import java.io.FileNotFoundException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
-import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
* JUnit Test for {@link ZipUtils}
*
- * TODO: this is broken on Windows: see bug #52036
- *
+ * TODO: this is broken on Windows: see bug #52036 (GEODE-312)
*/
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class ZipUtilsJUnitTest {
- private static final String sourceFolderName = "sourceFolder";
- private static final String zipFileName = "target.zip";
- private static final String destinationFolderName = "destination";
- private static final String clusterFolderName = "cluster";
- private static final String groupFolderName = "group";
- private static final String clusterTextFileName = "cf.txt";
- private static final String groupTextFileName = "gf.txt";
- private static final String clusterText = "cluster content";
- private static final String groupText = "group content";
-
- @After
- public void tearDown() throws Exception {
- forceDelete(new File(sourceFolderName));
- forceDelete(new File(zipFileName));
- forceDelete(new File(destinationFolderName));
- }
-
- private void forceDelete(File f) throws Exception {
- try {
- FileUtils.forceDelete(f);
- } catch (FileNotFoundException e) {
- // ignored
- }
+ private String destinationFolderName = "destination";
+ private String clusterFolderName = "cluster";
+ private String groupFolderName = "group";
+ private String clusterTextFileName = "cf.txt";
+ private String groupTextFileName = "gf.txt";
+ private String clusterText = "cluster content";
+ private String groupText = "group content";
+
+ private File sourceFolder;
+ private File zipFolder;
+
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Before
+ public void setUp() throws Exception {
+ sourceFolder = temporaryFolder.newFolder("sourceFolder");
+
+ File clusterFolder = new File(sourceFolder.getCanonicalPath(), clusterFolderName);
+ assertTrue(clusterFolder.mkdir());
+
+ File groupFolder = new File(sourceFolder.getCanonicalPath(), groupFolderName);
+ assertTrue(groupFolder.mkdir());
+
+ zipFolder = temporaryFolder.newFolder("zipFolder");
+
+ FileUtils.writeStringToFile(new File(FilenameUtils.concat(clusterFolder.getCanonicalPath(), clusterTextFileName)), clusterText);
+ FileUtils.writeStringToFile(new File(FilenameUtils.concat(groupFolder.getCanonicalPath(), groupTextFileName)), groupText);
}
@Test
public void testZipUtils() throws Exception {
- File sf = new File(sourceFolderName);
- File cf = new File(FilenameUtils.concat(sourceFolderName, clusterFolderName));
- File gf = new File(FilenameUtils.concat(sourceFolderName, groupFolderName));
- sf.mkdir();
- cf.mkdir();
- gf.mkdir();
- FileUtils.writeStringToFile(new File(FilenameUtils.concat(cf.getCanonicalPath(), clusterTextFileName)), clusterText);
- FileUtils.writeStringToFile(new File(FilenameUtils.concat(gf.getCanonicalPath(), groupTextFileName)), groupText);
- ZipUtils.zip(sourceFolderName, zipFileName);
- File zipFile = new File(zipFileName);
+ File zipFile = new File(zipFolder, "target.zip");
+ assertFalse(zipFile.exists());
+ assertFalse(zipFile.isFile());
+
+ ZipUtils.zip(sourceFolder.getCanonicalPath(), zipFile.getCanonicalPath());
assertTrue(zipFile.exists());
assertTrue(zipFile.isFile());
- ZipUtils.unzip(zipFileName, destinationFolderName);
-
- File df = new File(destinationFolderName);
- assertTrue(df.exists());
- assertTrue(df.isDirectory());
-
- File[] subDirs = df.listFiles();
- assertTrue((subDirs != null) && (subDirs.length != 0));
- File dfClusterTextFile = new File(FilenameUtils.concat(destinationFolderName, clusterFolderName + File.separator + clusterTextFileName));
- File dfGroupTextFile = new File (FilenameUtils.concat(destinationFolderName, groupFolderName + File.separator + groupTextFileName));
+
+ File destinationFolder = new File(FilenameUtils.concat(temporaryFolder.getRoot().getCanonicalPath(), destinationFolderName));
+ assertFalse(destinationFolder.exists());
+ assertFalse(destinationFolder.isFile());
+
+ ZipUtils.unzip(zipFile.getCanonicalPath(), destinationFolder.getCanonicalPath());
+ assertTrue(destinationFolder.exists());
+ assertTrue(destinationFolder.isDirectory());
- assertTrue(clusterText.equals(FileUtils.readFileToString(dfClusterTextFile)));
- assertTrue(groupText.equals(FileUtils.readFileToString(dfGroupTextFile)));
+ File[] destinationSubDirs = destinationFolder.listFiles();
+ assertNotNull(destinationSubDirs);
+ assertEquals(2, destinationSubDirs.length);
+
+ File destinationClusterTextFile = new File(FilenameUtils.concat(destinationFolder.getCanonicalPath(), clusterFolderName + File.separator + clusterTextFileName));
+ assertTrue(destinationClusterTextFile.exists());
+ assertTrue(destinationClusterTextFile.isFile());
+
+ File destinationGroupTextFile = new File(FilenameUtils.concat(destinationFolder.getCanonicalPath(), groupFolderName + File.separator + groupTextFileName));
+ assertTrue(destinationGroupTextFile.exists());
+ assertTrue(destinationGroupTextFile.isFile());
+
+ assertTrue(clusterText.equals(FileUtils.readFileToString(destinationClusterTextFile)));
+ assertTrue(groupText.equals(FileUtils.readFileToString(destinationGroupTextFile)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
index 57d1c7e..d4d0d8e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -16,16 +16,13 @@
*/
package com.gemstone.gemfire.management.internal.configuration.domain;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
-
import javax.xml.XMLConstants;
import org.junit.Test;
@@ -44,16 +41,14 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Test cases for {@link CacheElement}.
- *
- *
- * @see CacheElement
*
+ * @see CacheElement
* @since 8.1
*/
@Category(UnitTest.class)
public class CacheElementJUnitTest {
- private static final Document loadSchema(final String schemaLocation) throws Exception {
+ private Document loadSchema(final String schemaLocation) throws Exception {
final CacheXmlParser entityResolver = new CacheXmlParser();
final XMLReader xmlReader = XMLReaderFactory.createXMLReader();
xmlReader.setEntityResolver(entityResolver);
@@ -98,7 +93,6 @@ public class CacheElementJUnitTest {
* correct order. If we change to use choice for all elements then we can
* abandon this mapping.
*
- * @throws IOException
* @since 8.1
*/
@Test
@@ -134,7 +128,7 @@ public class CacheElementJUnitTest {
assertTrue("Extra entries in map.", !entries.hasNext());
}
- protected void assertEntry(final String expectedName, final int expectedOrder, final Entry<String, CacheElement> entry) {
+ private void assertEntry(final String expectedName, final int expectedOrder, final Entry<String, CacheElement> entry) {
assertEquals("Entry key out of order.", expectedName, entry.getKey());
assertEquals("Entry value name out of order.", expectedName, entry.getValue().getName());
assertEquals("Entry value order out of order.", expectedOrder, entry.getValue().getOrder());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index 24702c3..f0d8c83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -45,7 +45,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Unit tests for {@link XmlUtils}. See Also {@link XmlUtilsAddNewNodeJUnitTest}
* for tests related to {@link XmlUtils#addNewNode(Document, XmlEntity)}
- *
*
* @since 8.1
*/
@@ -54,13 +53,10 @@ public class XmlUtilsJUnitTest {
/**
* Test method for {@link XmlUtils#buildSchemaLocationMap(String)}.
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
*/
@Test
- public void testBuildSchemaLocationMapAttribute() throws SAXException, ParserConfigurationException, IOException {
- final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
+ public void testBuildSchemaLocationMapAttribute() throws Exception {
+ final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml")));
final String schemaLocationAttribute = XmlUtils.getAttribute(doc.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION,
W3C_XML_SCHEMA_INSTANCE_NS_URI);
@@ -86,21 +82,18 @@ public class XmlUtilsJUnitTest {
/**
* Test method for {@link XmlUtils#buildSchemaLocationMap(Map, String)}.
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
*/
@Test
- public void testBuildSchemaLocationMapMapOfStringListOfStringAttribute() throws SAXException, ParserConfigurationException, IOException {
+ public void testBuildSchemaLocationMapMapOfStringListOfStringAttribute() throws Exception {
Map<String, List<String>> schemaLocationMap = new HashMap<>();
- final Document doc1 = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
+ final Document doc1 = XmlUtils.createDocumentFromReader(new InputStreamReader(getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml")));
final String schemaLocationAttribute1 = XmlUtils.getAttribute(doc1.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION,
W3C_XML_SCHEMA_INSTANCE_NS_URI);
schemaLocationMap = XmlUtils.buildSchemaLocationMap(schemaLocationMap, schemaLocationAttribute1);
- final Document doc2 = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
+ final Document doc2 = XmlUtils.createDocumentFromReader(new InputStreamReader(getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml")));
final String schemaLocationAttribute2 = XmlUtils.getAttribute(doc2.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION,
W3C_XML_SCHEMA_INSTANCE_NS_URI);
@@ -133,13 +126,10 @@ public class XmlUtilsJUnitTest {
/**
* Test method for {@link XmlUtils#buildSchemaLocationMap(Map, String)}.
* Asserts map is empty if schemaLocation attribute is <code>null</code>.
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
*/
@Test
- public void testBuildSchemaLocationMapNullAttribute() throws SAXException, ParserConfigurationException, IOException {
- final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
+ public void testBuildSchemaLocationMapNullAttribute() throws Exception {
+ final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml")));
final String schemaLocationAttribute = XmlUtils.getAttribute(doc.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION,
W3C_XML_SCHEMA_INSTANCE_NS_URI);
@@ -151,13 +141,10 @@ public class XmlUtilsJUnitTest {
/**
* Test method for {@link XmlUtils#buildSchemaLocationMap(Map, String)}.
* Asserts map is empty if schemaLocation attribute is empty.
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
*/
@Test
- public void testBuildSchemaLocationMapEmptyAttribute() throws SAXException, ParserConfigurationException, IOException {
- final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
+ public void testBuildSchemaLocationMapEmptyAttribute() throws Exception {
+ final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml")));
final String schemaLocationAttribute = XmlUtils.getAttribute(doc.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION,
W3C_XML_SCHEMA_INSTANCE_NS_URI);
@@ -169,14 +156,10 @@ public class XmlUtilsJUnitTest {
/**
* Test method for
* {@link XmlUtils#querySingleElement(Node, String, XPathContext)}.
- * @throws XPathExpressionException
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
*/
@Test
- public void testQuerySingleElement() throws XPathExpressionException, SAXException, ParserConfigurationException, IOException {
- final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
+ public void testQuerySingleElement() throws Exception {
+ final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testQuerySingleElement.xml")));
final Element root = doc.getDocumentElement();
final String cacheNamespace = "http://geode.apache.org/schema/cache";
@@ -209,19 +192,16 @@ public class XmlUtilsJUnitTest {
try {
XmlUtils.querySingleElement(root, q4, cacheXPathContext);
fail("Expected XPathExpressionException");
- } catch (XPathExpressionException e) {
+ } catch (XPathExpressionException expected) {
// ignore
}
-
}
/**
* Test method for {@link XmlUtils#changeNamespace(Node, String, String)}.
- * @throws XPathExpressionException
- * @throws ParserConfigurationException
*/
@Test
- public void testChangeNamespace() throws XPathExpressionException, ParserConfigurationException {
+ public void testChangeNamespace() throws Exception {
Document doc = XmlUtils.getDocumentBuilder().newDocument();
Element root = doc.createElement("root");
root = (Element) doc.appendChild(root);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
index d9362cd..03d39fd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
@@ -17,9 +17,11 @@
package com.gemstone.gemfire.management.internal.web.controllers;
import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;
-import static junitparams.JUnitParamsRunner.$;
+import static junitparams.JUnitParamsRunner.*;
import static org.assertj.core.api.Assertions.*;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -27,14 +29,10 @@ import org.junit.runner.RunWith;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-
/**
* Unit tests for WanCommandsController.
*
* Introduced for GEODE-213 "JMX -http manager treats "start gateway-sender" as "start gateway-receiver"
- *
*/
@SuppressWarnings("unused")
@Category(UnitTest.class)
@@ -127,7 +125,8 @@ public class WanCommandsControllerJUnitTest {
* performed by two different classes. Then we could mock the executor
* class while testing just the command string definition class.
*/
- public static class TestableWanCommandsController extends WanCommandsController {
+ private static class TestableWanCommandsController extends WanCommandsController {
+
protected String testableCommand;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java
index 11ac89c..fd9c5e3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ByteSourceJUnitTest.java
@@ -39,7 +39,10 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class ByteSourceJUnitTest {
-
+
+ /**
+ * Override as needed in subclass.
+ */
protected ByteSource createByteSource(byte[] bytes) {
return ByteSourceFactory.wrap(bytes);
}
@@ -617,6 +620,9 @@ public class ByteSourceJUnitTest {
}
}
+ /**
+ * Override as needed in subclass.
+ */
protected boolean isTestOffHeap() {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index 14a514d..55aa5aa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -372,7 +372,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
byte[] o1 = jsonParse(jd.getJsonByteArray());
byte[] o2 = jsonParse(jsonByteArray);
- // junit.framework.Assert.assertEquals("Pdx byte aray are not equal after fetching from cache " + jd.getFileName(), o1, o2);
+ // junit.framework.Assert.assertIndexDetailsEquals("Pdx byte aray are not equal after fetching from cache " + jd.getFileName(), o1, o2);
compareByteArray(o1, o2);
PdxInstance pdx2 = JSONFormatter.fromJSON(jsonByteArray);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/pdx/OffHeapByteSourceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/OffHeapByteSourceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/OffHeapByteSourceJUnitTest.java
index 7946b7e..c914e3f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/OffHeapByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/OffHeapByteSourceJUnitTest.java
@@ -35,12 +35,12 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
public class OffHeapByteSourceJUnitTest extends ByteSourceJUnitTest {
@Before
- public void setUp() throws Exception {
+ public final void setUp() throws Exception {
MemoryAllocatorImpl.createForUnitTest(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), new SlabImpl[]{new SlabImpl(1024*1024)});
}
@After
- public void tearDown() throws Exception {
+ public final void tearDown() throws Exception {
MemoryAllocatorImpl.freeOffHeapMemory();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
index 70ae048..fde1a27 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
@@ -321,21 +321,21 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
// //Test puts and get in a transaction
// txManager.begin();
// region.put("C", new TestSerializable());
-// assertEquals(TestSerializable.class, region.get("C").getClass());
+// assertIndexDetailsEquals(TestSerializable.class, region.get("C").getClass());
// txManager.commit();
//
// txManager.begin();
-// assertEquals(TestSerializable.class, region.get("C").getClass());
+// assertIndexDetailsEquals(TestSerializable.class, region.get("C").getClass());
// txManager.commit();
//
//
// //Test cache load in a transaction
// txManager.begin();
-// assertEquals(TestSerializable.class, region.get("D").getClass());
+// assertIndexDetailsEquals(TestSerializable.class, region.get("D").getClass());
// txManager.commit();
//
// txManager.begin();
-// assertEquals(TestSerializable.class, region.get("D").getClass());
+// assertIndexDetailsEquals(TestSerializable.class, region.get("D").getClass());
// txManager.commit();
}
@@ -343,8 +343,8 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
assertEquals(TestSerializable.class, region.get("A").getClass());
assertEquals(TestSerializable.class, region.get("B").getClass());
//TODO Transactions don't work
-// assertEquals(TestSerializable.class, region.get("C").getClass());
-// assertEquals(TestSerializable.class, region.get("D").getClass());
+// assertIndexDetailsEquals(TestSerializable.class, region.get("C").getClass());
+// assertIndexDetailsEquals(TestSerializable.class, region.get("D").getClass());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
index 58d3442..f9e45b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
@@ -436,7 +436,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
// if ((flags & OpFlags.CHECK_NOTAUTHZ) > 0) {
// Object value = region.get(key);
// assertNotNull(value);
- // assertEquals(vals[index], value);
+ // assertIndexDetailsEquals(vals[index], value);
// }
// else {
// region.put(key, vals[index]);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java
index ec054d7..67dfadc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java
@@ -71,10 +71,10 @@ public class NotAuthorizedExceptionTest {
this.nonSerializablePrincipal = mock(Principal.class);
this.serializablePrincipal = new SerializablePrincipal(this.principalName);
- assertPreConditions();
+ assertPreconditions();
}
- private void assertPreConditions() {
+ private void assertPreconditions() {
catchException(this).clone(this.nonSerializableNamingException);
assertThat((Throwable)caughtException()).isNotNull();
assertThat((Throwable)caughtException().getCause()).isInstanceOf(NotSerializableException.class);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSPrincipalTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSPrincipalTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSPrincipalTest.java
index 677e2d4..95cd99c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSPrincipalTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSPrincipalTest.java
@@ -24,12 +24,13 @@ import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Unit tests for {@link PKCSPrincipal}
*/
-@Category(UnitTest.class)
+@Category({ UnitTest.class, SecurityTest.class })
public class PKCSPrincipalTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java
index bce19b4..7fbb454 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java
@@ -24,12 +24,13 @@ import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Unit tests for {@link UsernamePrincipal}
*/
-@Category(UnitTest.class)
+@Category({ UnitTest.class, SecurityTest.class })
public class UsernamePrincipalTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
index 5d927eb..683d01c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.test.dunit;
* Extends <code>org.junit.Assert</code> with additional assertion and fail
* methods.
*
- * These methods can be used directly: <code>Assert.assertEquals(...)</code>,
+ * These methods can be used directly: <code>Assert.assertIndexDetailsEquals(...)</code>,
* however, they are intended to be referenced through static import:
*
* <pre>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
index 82ede05..cc0b69c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.GemFireException;
* vm.invoke(() -> this.getUnknownObject());
*
* } catch (RMIException ex) {
- * assertEquals(ex.getCause() instanceof ObjectException);
+ * assertIndexDetailsEquals(ex.getCause() instanceof ObjectException);
* }
* </PRE>
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
index f9291fd..ec40423 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
@@ -39,7 +39,7 @@ import java.util.concurrent.Callable;
* }
* });
* assertNull(vm0.invoke(putMethod));
- * assertEquals(value, vm1.invoke(putMethod));
+ * assertIndexDetailsEquals(value, vm1.invoke(putMethod));
* }
* </PRE>
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
index 4776775..28ef471 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
@@ -40,7 +40,7 @@ import java.io.Serializable;
* vm1.invoke(new SerializableRunnable("Get value") {
* public void run() {
* ...// get the region //...
- * assertEquals(value, region.get(name));
+ * assertIndexDetailsEquals(value, region.get(name));
* }
* });
* }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-core/src/test/java/com/gemstone/gemfire/test/process/MainLauncherJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/process/MainLauncherJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/process/MainLauncherJUnitTest.java
index 15341c6..230a9d4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/process/MainLauncherJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/process/MainLauncherJUnitTest.java
@@ -37,21 +37,20 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Quick sanity tests to make sure MainLauncher is functional.
- *
*/
@Category(UnitTest.class)
public class MainLauncherJUnitTest {
private static final long TIMEOUT_SECONDS = 10;
- @Rule
- public final TextFromStandardInputStream systemInMock = emptyStandardInputStream();
-
private static volatile boolean flag = false;
-
+
private final String launchedClass = getClass().getName();
private ExecutorService futures;
+ @Rule
+ public final TextFromStandardInputStream systemInMock = emptyStandardInputStream();
+
@Before
public void before() {
flag = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 4e0ec90..2b2dbd7 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -1190,7 +1190,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
// Since ResultSet is not maintained for this release.
// Instead of resultSize its been validated with total number of events.
fail("test for event counts instead of results size");
-// assertEquals("Result Size mismatch", resultSize, listener.getTotalEventCount());
+// assertIndexDetailsEquals("Result Size mismatch", resultSize, listener.getTotalEventCount());
}
// Check for create count.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 4ba5e48..548dd2f 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -1019,7 +1019,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
// Since ResultSet is not maintained for this release.
// Instead of resultSize its been validated with total number of events.
fail("test for event counts instead of results size");
-// assertEquals("Result Size mismatch", resultSize, listener.getTotalEventCount());
+// assertIndexDetailsEquals("Result Size mismatch", resultSize, listener.getTotalEventCount());
}
// Check for create count.
@@ -1387,7 +1387,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
assertNotNull(region);
// Set keys = region.entrySet();
-// assertEquals("Mismatch, number of keys in local region is not equal to the interest list size",
+// assertIndexDetailsEquals("Mismatch, number of keys in local region is not equal to the interest list size",
// size, keys.size());
// TODO does this WaitCriterion actually help?
WaitCriterion wc = new WaitCriterion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index 26cda3c..fcd8160 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -146,7 +146,7 @@ public class CqStatsDUnitTest extends CacheTestCase {
}
//// Check for initial results time.
// if (initialResultsTime != CqQueryDUnitTest.noTest && cqVsdStats.getCqInitialResultsTime() <= 0) {
-// assertEquals("Initial results time mismatch", initialResultsTime, cqVsdStats.getCqInitialResultsTime());
+// assertIndexDetailsEquals("Initial results time mismatch", initialResultsTime, cqVsdStats.getCqInitialResultsTime());
// }
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index d4ba5ff..71b11d8 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -146,7 +146,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
}
//// Check for initial results time.
// if (initialResultsTime != CqQueryUsingPoolDUnitTest.noTest && cqVsdStats.getCqInitialResultsTime() <= 0) {
-// assertEquals("Initial results time mismatch", initialResultsTime, cqVsdStats.getCqInitialResultsTime());
+// assertIndexDetailsEquals("Initial results time mismatch", initialResultsTime, cqVsdStats.getCqInitialResultsTime());
// }
}
});