You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/27 01:17:14 UTC
[02/16] incubator-geode git commit: Updating and fixing tests
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/DataCommandJsonJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/DataCommandJsonJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/DataCommandJsonJUnitTest.java
index c95faee..f11afd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/DataCommandJsonJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/DataCommandJsonJUnitTest.java
@@ -16,26 +16,23 @@
*/
package com.gemstone.gemfire.management.internal.cli;
+import static org.junit.Assert.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
-import junit.framework.TestCase;
-
import com.gemstone.gemfire.management.internal.cli.dto.Car;
import com.gemstone.gemfire.management.internal.cli.util.JsonUtil;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-/**
- *
- *
- */
@Category(UnitTest.class)
-public class DataCommandJsonJUnitTest extends TestCase{
+public class DataCommandJsonJUnitTest {
-
+ @Test
public void testCollectionTypesInJson(){
String json = "{'attributes':{'power':'90hp'},'make':'502.1825','model':'502.1825','colors':['red','white','blue'],'attributeSet':['red','white','blue'], 'attributeArray':['red','white','blue']}";
Car car = (Car)JsonUtil.jsonToObject(json, Car.class);
@@ -55,6 +52,5 @@ public class DataCommandJsonJUnitTest extends TestCase{
assertNotNull(car.getAttributeArray());
assertTrue(car.getAttributeArray() instanceof String[]);
assertEquals(3, car.getAttributeArray().length);
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
index 91dd853..1ff647e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
@@ -16,9 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -53,7 +51,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* GfshParserJUnitTest - Includes tests to check the parsing and auto-completion
* capabilities of {@link GfshParser}
- *
*/
@Category(UnitTest.class)
public class GfshParserJUnitTest {
@@ -446,7 +443,6 @@ public class GfshParserJUnitTest {
private void assertSimpleCompletionValues(List<String> expected,
List<String> actual) {
- // TODO Auto-generated method stub
assertEquals("Check size", expected.size(), actual.size());
for (int i = 0; i < expected.size(); i++) {
assertEquals("Check completion value no." + i +". Expected("+expected.get(i)+") & Actual("+actual.get(i)+").", expected.get(i),
@@ -756,7 +752,6 @@ public class GfshParserJUnitTest {
private void assertAdvancedCompletionValues(List<Completion> expected,
List<Completion> actual) {
- // TODO Auto-generated method stub
assertEquals("Check size", expected.size(), actual.size());
for (int i = 0; i < expected.size(); i++) {
assertEquals("Check completion value no." + i+". Expected("+expected.get(i)+") & Actual("+actual.get(i)+").",
@@ -995,10 +990,12 @@ public class GfshParserJUnitTest {
assertEquals(arguments[1], "this is a second argument");
}
+ @Test
public void testDefaultAvailabilityMessage() throws Exception {
checkAvailabilityMessage(new AvailabilityCommands(), AvailabilityCommands.C2_NAME, AvailabilityCommands.C2_MSG_UNAVAILABLE, AvailabilityCommands.C2_PROP);
}
+ @Test
public void testCustomAvailabilityMessage() throws Exception {
checkAvailabilityMessage(new AvailabilityCommands(), AvailabilityCommands.C1_NAME, AvailabilityCommands.C1_MSG_UNAVAILABLE, AvailabilityCommands.C1_PROP);
}
@@ -1024,9 +1021,6 @@ public class GfshParserJUnitTest {
System.setProperty(availabiltyBooleanProp, "true");
parseResult = parser.parse(commandString);
assertNotNull("ParseResult should not be null for available command.", parseResult);
- } catch (CommandProcessingException e) {
- fail("Command \""+commandString+"\" is expected to be available");
- e.printStackTrace();
} finally {
System.clearProperty(availabiltyBooleanProp);
}
@@ -1083,24 +1077,24 @@ public class GfshParserJUnitTest {
static class SimpleConverter implements Converter<String> {
+ @Override
public boolean supports(Class<?> type, String optionContext) {
- // TODO Auto-generated method stub
if (type.isAssignableFrom(String.class)) {
return true;
}
return false;
}
+ @Override
public String convertFromText(String value, Class<?> targetType,
String optionContext) {
- // TODO Auto-generated method stub
return value;
}
+ @Override
public boolean getAllPossibleValues(List<Completion> completions,
Class<?> targetType, String existingData, String context,
MethodTarget target) {
- // TODO Auto-generated method stub
if (context.equals(ARGUMENT1_CONTEXT)) {
for (Completion completion : ARGUMENT1_COMPLETIONS) {
completions.add(completion);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/annotations/CliArgumentJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/annotations/CliArgumentJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/annotations/CliArgumentJUnitTest.java
index f7b55f3..e38a9ca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/annotations/CliArgumentJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/annotations/CliArgumentJUnitTest.java
@@ -16,20 +16,19 @@
*/
package com.gemstone.gemfire.management.internal.cli.annotations;
-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.annotation.CliArgument;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Includes tests for checking assignment of {@link CliArgument}
- *
- *
*/
@Category(UnitTest.class)
-public class CliArgumentJUnitTest extends TestCase {
+public class CliArgumentJUnitTest {
private static final String ARGUMENT_NAME = "ARGUMENT_NAME";
private static final String ARGUMENT_HELP = "ARGUMENT_HELP";
@@ -43,169 +42,87 @@ public class CliArgumentJUnitTest extends TestCase {
/**
* Test for {@link CliArgument#name()}
*/
- public void testName() {
- try {
- String name = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "defaultArgumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).name();
- assertNotNull(name);
- assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, name, ARGUMENT_NAME);
- name = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "argumentTestingMethod", String.class).getParameterAnnotations()[0][0]))
- .name();
- assertNotNull(name);
- assertEquals(MESSAGE_FOR_ARGUMENT, name, ARGUMENT_NAME);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void testName() throws Exception {
+ String name = ((CliArgument) (ArgumentTestingClass.class.getMethod("defaultArgumentTestingMethod", String.class).getParameterAnnotations()[0][0])).name();
+ assertNotNull(name);
+ assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, name, ARGUMENT_NAME);
+ name = ((CliArgument) (ArgumentTestingClass.class.getMethod("argumentTestingMethod", String.class).getParameterAnnotations()[0][0])).name();
+ assertNotNull(name);
+ assertEquals(MESSAGE_FOR_ARGUMENT, name, ARGUMENT_NAME);
}
/**
* Test for {@link CliArgument#help()}
*/
- public void testHelp() {
- try {
- String help = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "defaultArgumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).help();
- assertNotNull(help);
- assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, help, "");
- help = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "argumentTestingMethod", String.class).getParameterAnnotations()[0][0]))
- .help();
- assertNotNull(help);
- assertEquals(MESSAGE_FOR_ARGUMENT, help, ARGUMENT_HELP);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void testHelp() throws Exception {
+ String help = ((CliArgument) (ArgumentTestingClass.class.getMethod("defaultArgumentTestingMethod", String.class).getParameterAnnotations()[0][0])).help();
+ assertNotNull(help);
+ assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, help, "");
+ help = ((CliArgument) (ArgumentTestingClass.class.getMethod("argumentTestingMethod", String.class).getParameterAnnotations()[0][0])).help();
+ assertNotNull(help);
+ assertEquals(MESSAGE_FOR_ARGUMENT, help, ARGUMENT_HELP);
}
/**
* Test for {@link CliArgument#mandatory()}
*/
- public void testMandatory() {
- try {
- boolean mandatory = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "defaultArgumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).mandatory();
- assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, mandatory, false);
- mandatory = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "argumentTestingMethod", String.class).getParameterAnnotations()[0][0]))
- .mandatory();
- assertEquals(MESSAGE_FOR_ARGUMENT, mandatory, ARGUMENT_MANDATORY);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void testMandatory() throws Exception {
+ boolean mandatory = ((CliArgument) (ArgumentTestingClass.class.getMethod("defaultArgumentTestingMethod", String.class).getParameterAnnotations()[0][0])).mandatory();
+ assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, mandatory, false);
+ mandatory = ((CliArgument) (ArgumentTestingClass.class.getMethod("argumentTestingMethod", String.class).getParameterAnnotations()[0][0])).mandatory();
+ assertEquals(MESSAGE_FOR_ARGUMENT, mandatory, ARGUMENT_MANDATORY);
}
/**
* Test for {@link CliArgument#argumentContext()}
*/
- public void testArgumentContext() {
- try {
- String argumentContext = ((CliArgument) (ArgumentTestingClass.class
- .getMethod("defaultArgumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).argumentContext();
- assertNotNull(argumentContext);
- assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, argumentContext, "");
- argumentContext = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "argumentTestingMethod", String.class).getParameterAnnotations()[0][0]))
- .argumentContext();
- assertNotNull(argumentContext);
- assertEquals(MESSAGE_FOR_ARGUMENT, argumentContext, ARGUMENT_CONTEXT);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void testArgumentContext() throws Exception {
+ String argumentContext = ((CliArgument) (ArgumentTestingClass.class.getMethod("defaultArgumentTestingMethod", String.class).getParameterAnnotations()[0][0])).argumentContext();
+ assertNotNull(argumentContext);
+ assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, argumentContext, "");
+ argumentContext = ((CliArgument) (ArgumentTestingClass.class.getMethod("argumentTestingMethod", String.class).getParameterAnnotations()[0][0])).argumentContext();
+ assertNotNull(argumentContext);
+ assertEquals(MESSAGE_FOR_ARGUMENT, argumentContext, ARGUMENT_CONTEXT);
}
/**
* Test for {@link CliArgument#systemProvided()}
*/
- public void testSystemProvided() {
- try {
- boolean systemProvided = ((CliArgument) (ArgumentTestingClass.class
- .getMethod("defaultArgumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).systemProvided();
- assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, systemProvided, false);
- systemProvided = ((CliArgument) (ArgumentTestingClass.class.getMethod(
- "argumentTestingMethod", String.class).getParameterAnnotations()[0][0]))
- .systemProvided();
- assertEquals(MESSAGE_FOR_ARGUMENT, systemProvided, SYSTEM_PROVIDED);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void testSystemProvided() throws Exception {
+ boolean systemProvided = ((CliArgument) (ArgumentTestingClass.class.getMethod("defaultArgumentTestingMethod", String.class).getParameterAnnotations()[0][0])).systemProvided();
+ assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, systemProvided, false);
+ systemProvided = ((CliArgument) (ArgumentTestingClass.class.getMethod("argumentTestingMethod", String.class).getParameterAnnotations()[0][0])).systemProvided();
+ assertEquals(MESSAGE_FOR_ARGUMENT, systemProvided, SYSTEM_PROVIDED);
}
/**
* Test for {@link CliArgument#unspecifiedDefaultValue()}
*/
- public void testUnspecifiedDefaultValue() {
- try {
- String unspecifiedDefaultValue = ((CliArgument) (ArgumentTestingClass.class
- .getMethod("defaultArgumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).unspecifiedDefaultValue();
- assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, unspecifiedDefaultValue,
- "__NULL__");
- unspecifiedDefaultValue = ((CliArgument) (ArgumentTestingClass.class
- .getMethod("argumentTestingMethod", String.class)
- .getParameterAnnotations()[0][0])).unspecifiedDefaultValue();
- assertEquals(MESSAGE_FOR_ARGUMENT, unspecifiedDefaultValue,
- ARGUMENT_UNSPECIFIED_DEFAULT_VALUE);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void testUnspecifiedDefaultValue() throws Exception {
+ String unspecifiedDefaultValue = ((CliArgument) (ArgumentTestingClass.class.getMethod("defaultArgumentTestingMethod", String.class).getParameterAnnotations()[0][0])).unspecifiedDefaultValue();
+ assertEquals(MESSAGE_FOR_DEFAULT_ARGUMENT, unspecifiedDefaultValue, "__NULL__");
+ unspecifiedDefaultValue = ((CliArgument) (ArgumentTestingClass.class.getMethod("argumentTestingMethod", String.class).getParameterAnnotations()[0][0])).unspecifiedDefaultValue();
+ assertEquals(MESSAGE_FOR_ARGUMENT, unspecifiedDefaultValue, ARGUMENT_UNSPECIFIED_DEFAULT_VALUE);
}
/**
* Class used by the tests
- *
- *
*/
public static class ArgumentTestingClass {
- /**
- * @param defaultargument
- * @return Object
- */
@SuppressWarnings("unused")
- public static Object defaultArgumentTestingMethod(
- @CliArgument(name = ARGUMENT_NAME)
- String defaultargument) {
+ public static Object defaultArgumentTestingMethod(@CliArgument(name = ARGUMENT_NAME) String defaultArgument) {
return null;
}
- /**
- * @param argument
- * @return Object
- */
@SuppressWarnings("unused")
- public static Object argumentTestingMethod(
- @CliArgument(name = ARGUMENT_NAME, help = ARGUMENT_HELP, mandatory = ARGUMENT_MANDATORY, argumentContext = ARGUMENT_CONTEXT, systemProvided = SYSTEM_PROVIDED, unspecifiedDefaultValue = ARGUMENT_UNSPECIFIED_DEFAULT_VALUE)
- String argument) {
+ public static Object argumentTestingMethod(@CliArgument(name = ARGUMENT_NAME, help = ARGUMENT_HELP, mandatory = ARGUMENT_MANDATORY, argumentContext = ARGUMENT_CONTEXT, systemProvided = SYSTEM_PROVIDED, unspecifiedDefaultValue = ARGUMENT_UNSPECIFIED_DEFAULT_VALUE) String argument) {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 6858f78..d99bbd4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -306,7 +306,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
"Members Array for region " + region + " : " + StringUtils.objectToString(membersName, true, 10));
if (bean.getMemberCount() < 1) fail(
"Even after waiting mbean reports number of member hosting region " + DATA_REGION_NAME_VM1_PATH + " is less than one");
- //assertEquals(1, membersName.length); //exists in one members vm1
+ //assertIndexDetailsEquals(1, membersName.length); //exists in one members vm1
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index 344d116..38849c7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -118,7 +118,7 @@ public class HTTPServiceSSLSupportJUnitTest {
assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStore"), jks.getCanonicalPath());
assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStorePassword"), "password");
- // assertEquals(system.getConfig().getHttpServiceSSLKeyStoreType(),"JKS");
+ // assertIndexDetailsEquals(system.getConfig().getHttpServiceSSLKeyStoreType(),"JKS");
assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStore"), jks.getCanonicalPath());
assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStorePassword"), "password");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index d2bdcba..c8e0ed9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -278,7 +278,7 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
EMPTY_ENV).process();
assertEquals(true, result.getStatus().equals(Status.OK));
getLogWriter().info("#SB" + getResultAsString(result));
- //assertEquals(true, result.getStatus().equals(Status.OK));
+ //assertIndexDetailsEquals(true, result.getStatus().equals(Status.OK));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverterJUnitTest.java
index 6a2e1c0..44d6d3f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverterJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverterJUnitTest.java
@@ -39,11 +39,9 @@ public class RegionPathConverterJUnitTest {
@Before
public void setup() {
- mockContext = new Mockery() {
- {
- setImposteriser(ClassImposteriser.INSTANCE);
- }
- };
+ mockContext = new Mockery() {{
+ setImposteriser(ClassImposteriser.INSTANCE);
+ }};
}
@After
@@ -55,12 +53,10 @@ public class RegionPathConverterJUnitTest {
protected RegionPathConverter createMockRegionPathConverter(final String[] allRegionPaths) {
final RegionPathConverter mockRegionPathConverter = mockContext.mock(RegionPathConverter.class, "RPC");
- mockContext.checking(new Expectations() {
- {
- oneOf(mockRegionPathConverter).getAllRegionPaths();
- will(returnValue(new TreeSet<String>(Arrays.asList(allRegionPaths))));
- }
- });
+ mockContext.checking(new Expectations() {{
+ oneOf(mockRegionPathConverter).getAllRegionPaths();
+ will(returnValue(new TreeSet<String>(Arrays.asList(allRegionPaths))));
+ }});
return mockRegionPathConverter;
}
@@ -76,7 +72,6 @@ public class RegionPathConverterJUnitTest {
Set<String> mocked = mockRegionPathConverter.getAllRegionPaths();
assertEquals("mocked paths don't match expectedPaths.", mocked, expectedPaths);
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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..825053e 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.
@@ -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();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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..5d052d7 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,10 +372,9 @@ 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;
}
}
@@ -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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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 d4edfeb..9792171 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
@@ -28,24 +28,21 @@ 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;
import com.gemstone.gemfire.management.internal.cli.CommandManager;
import com.gemstone.gemfire.management.internal.cli.GfshParser;
import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
-import com.gemstone.gemfire.management.cli.CliMetaData;
-import com.gemstone.gemfire.management.cli.ConverterHint;
import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
-import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
-import com.gemstone.gemfire.management.internal.cli.shell.GfshConfig;
-import com.gemstone.gemfire.management.internal.cli.shell.GfshExecutionStrategy;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* 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";
@@ -65,8 +62,7 @@ public class GfshExecutionStrategyJUnitTest {
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);
@@ -86,8 +82,7 @@ public class GfshExecutionStrategyJUnitTest {
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);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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 5a5501d..62f16d7 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
@@ -16,7 +16,13 @@
*/
package com.gemstone.gemfire.management.internal.cli.shell;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.util.List;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -24,16 +30,9 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-/**
- */
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class GfshHistoryJUnitTest {
private File gfshHistoryFile;
@@ -82,7 +81,6 @@ 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));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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 dca5d0b..df58d1a 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
@@ -44,8 +44,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Test cases for {@link CacheElement}.
- *
- *
+ *
* @see CacheElement
*
* @since 8.1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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..6c1bcca 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
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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..4a36384 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)
@@ -128,6 +126,7 @@ public class WanCommandsControllerJUnitTest {
* class while testing just the command string definition class.
*/
public static class TestableWanCommandsController extends WanCommandsController {
+
protected String testableCommand;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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/ef0a6243/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/ef0a6243/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 7a4308f..a850e12 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
@@ -437,7 +437,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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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..5d1c05f 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,7 +37,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* Quick sanity tests to make sure MainLauncher is functional.
- *
*/
@Category(UnitTest.class)
public class MainLauncherJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/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/ef0a6243/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/ef0a6243/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/ef0a6243/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());
// }
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 5e4dd3d..29eec8e 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -169,7 +169,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
//cc1 = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
cc2 = server2.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
- //assertEquals("Should have one", 0, cc1);
+ //assertIndexDetailsEquals("Should have one", 0, cc1);
assertEquals("Should have one", 0, cc2);
cqHelper.closeServer(server2);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index fafcd9b..68960bd 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -2168,7 +2168,7 @@ public void testOneServer() throws CacheException, InterruptedException {
int client2Size = getRegionSize(client2, regionName);
int server1Size = getRegionSize(server1, regionName);
LogWriterUtils.getLogWriter().info("region sizes: "+client1Size+","+client2Size+","+server1Size);
-// assertEquals(server1Size, client1Size);
+// assertIndexDetailsEquals(server1Size, client1Size);
// restart server2
createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 020f967..5c3a1b3 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -85,7 +85,7 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase {
private final SerializableCallable verifyNoTxState = new SerializableCallable() {
public Object call() throws Exception {
//TXManagerImpl mgr = getGemfireCache().getTxManager();
- //assertEquals(0, mgr.hostedTransactionsInProgressForTest());
+ //assertIndexDetailsEquals(0, mgr.hostedTransactionsInProgressForTest());
final TXManagerImpl mgr = getGemfireCache().getTxManager();
Wait.waitForCriterion(new WaitCriterion() {
@Override
@@ -244,14 +244,14 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase {
Region.Entry eR = refRegion.getEntry(custId);
assertNotNull(eC);
assertNotNull(eR);
-// assertEquals(1,custRegion.size());
- // assertEquals(1,orderRegion.size());
- // assertEquals(1,refRegion.size());
+// assertIndexDetailsEquals(1,custRegion.size());
+ // assertIndexDetailsEquals(1,orderRegion.size());
+ // assertIndexDetailsEquals(1,refRegion.size());
} else {
- //assertEquals(0,custRegion.size());
- //assertEquals(0,orderRegion.size());
- //assertEquals(0,refRegion.size());
+ //assertIndexDetailsEquals(0,custRegion.size());
+ //assertIndexDetailsEquals(0,orderRegion.size());
+ //assertIndexDetailsEquals(0,refRegion.size());
try {
Region.Entry eC = custRegion.getEntry(custId);
assertNull("should have had an EntryNotFoundException:"+eC,eC);
@@ -303,13 +303,13 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase {
assertEquals(expectedCust, custRegion.getEntry(custId).getValue());
/*
assertNotNull(orderRegion.getEntry(orderId));
- assertEquals(expectedOrder, orderRegion.getEntry(orderId).getValue());
+ assertIndexDetailsEquals(expectedOrder, orderRegion.getEntry(orderId).getValue());
assertNotNull(orderRegion.getEntry(orderId2));
- assertEquals(expectedOrder2, orderRegion.getEntry(orderId2).getValue());
+ assertIndexDetailsEquals(expectedOrder2, orderRegion.getEntry(orderId2).getValue());
assertNotNull(orderRegion.getEntry(orderId3));
- assertEquals(expectedOrder3, orderRegion.getEntry(orderId3).getValue());
+ assertIndexDetailsEquals(expectedOrder3, orderRegion.getEntry(orderId3).getValue());
*/
assertNotNull(refRegion.getEntry(custId));
assertEquals(expectedRef, refRegion.getEntry(custId).getValue());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 5d2290b..6d830b8 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -454,7 +454,7 @@ public class CQListGIIDUnitTest extends DistributedTestCase {
assertTrue("executeWithInitialResults() state mismatch", cq1.getState()
.isRunning());
// if (expectedResultsSize >= 0) {
- // assertEquals("unexpected results size", expectedResultsSize, cqResults
+ // assertIndexDetailsEquals("unexpected results size", expectedResultsSize, cqResults
// .size());
// }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 563c9a7..cfe4d67 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -153,7 +153,7 @@ public class DurableClientTestCase extends DistributedTestCase {
assertTrue(proxy.isDurable());
assertEquals(durableClientId, proxy.getDurableId());
assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
- //assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
+ //assertIndexDetailsEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
}
});
@@ -216,7 +216,7 @@ public class DurableClientTestCase extends DistributedTestCase {
assertEquals(dId, proxy.getDurableId());
assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
- // assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
+ // assertIndexDetailsEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
}
});
@@ -339,7 +339,7 @@ public class DurableClientTestCase extends DistributedTestCase {
assertTrue(proxy.isDurable());
assertEquals(durableClientId, proxy.getDurableId());
assertEquals(durableClientTimeout, proxy.getDurableTimeout());
- //assertEquals(durableClientKeepAlive, proxy.getDurableKeepAlive());
+ //assertIndexDetailsEquals(durableClientKeepAlive, proxy.getDurableKeepAlive());
}
});
@@ -420,7 +420,7 @@ public class DurableClientTestCase extends DistributedTestCase {
assertTrue(proxy.isDurable());
assertEquals(durableClientId, proxy.getDurableId());
assertEquals(durableClientTimeout, proxy.getDurableTimeout());
- //assertEquals(durableClientKeepAlive, proxy.getDurableKeepAlive());
+ //assertIndexDetailsEquals(durableClientKeepAlive, proxy.getDurableKeepAlive());
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef0a6243/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index 06a5d1a..d784397 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -473,7 +473,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase {
}
protected void assertCacheServerConfig(CacheServerMXBean bean) {
- // assertEquals(ServerInfo.getInstance().getServerPort(), bean.getPort());
+ // assertIndexDetailsEquals(ServerInfo.getInstance().getServerPort(), bean.getPort());
assertEquals(CacheServer.DEFAULT_BIND_ADDRESS, bean.getBindAddress());
assertEquals(CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS, bean
.getHostNameForClients());