geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [01/18] 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 useful name
Date Fri, 06 May 2016 23:55:00 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 4ad4d63ca -> bf258f62b


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index c49a131..82c28ee 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -197,7 +197,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
 //      TabularResultData tableResultData =
 //        (TabularResultData) cmdResult.getResultData();
 //      List<String> result_Status = tableResultData.retrieveAllValues(CliStrings.RESULT_STATUS);
-//      assertEquals(1, result_Status.size());
+//      assertIndexDetailsEquals(1, result_Status.size());
 //      assertFalse(result_Status.contains(CliStrings.GATEWAY_NOT_RUNNING));
       String strCmdResult = commandResultToString(cmdResult);
       getLogWriter().info("testGatewaySenderStatus_OnMember : " + strCmdResult + ">>>>>
");
@@ -434,7 +434,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
       assertEquals(Result.Status.OK, cmdResult.getStatus());
       //TabularResultData tableResultData = (TabularResultData) cmdResult.getResultData();
       //List<String> result_Status = tableResultData.retrieveAllValues(CliStrings.RESULT_STATUS);
-      //assertEquals(1, result_Status.size());
+      //assertIndexDetailsEquals(1, result_Status.size());
       //assertFalse(strCmdResult.contains(CliStrings.GATEWAY_NOT_RUNNING));
       TabularResultData tableResultData =
           ((CompositeResultData)cmdResult.getResultData()).retrieveSection(CliStrings.SECTION_GATEWAY_RECEIVER_AVAILABLE).retrieveTable(CliStrings.TABLE_GATEWAY_RECEIVER);
@@ -463,7 +463,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
 //      TabularResultData tableResultData =
 //        (TabularResultData) cmdResult.getResultData();
 //      List<String> result_Status = tableResultData.retrieveAllValues(CliStrings.RESULT_STATUS);
-//      assertEquals(1, result_Status.size());
+//      assertIndexDetailsEquals(1, result_Status.size());
 //      assertFalse(result_Status.contains(CliStrings.GATEWAY_RUNNING));
       
       TabularResultData tableResultData =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
index 196be09..7234161 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
@@ -25,13 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import com.gemstone.gemfire.management.cli.CliMetaData;
-import com.gemstone.gemfire.management.internal.cli.util.ClasspathScanLoadHelper;
-import com.gemstone.gemfire.management.internal.web.domain.Link;
-import com.gemstone.gemfire.management.internal.web.domain.LinkIndex;
-import com.gemstone.gemfire.management.internal.web.util.UriUtils;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import javax.servlet.http.HttpServletRequest;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -45,7 +39,12 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
+import com.gemstone.gemfire.management.cli.CliMetaData;
+import com.gemstone.gemfire.management.internal.cli.util.ClasspathScanLoadHelper;
+import com.gemstone.gemfire.management.internal.web.domain.Link;
+import com.gemstone.gemfire.management.internal.web.domain.LinkIndex;
+import com.gemstone.gemfire.management.internal.web.util.UriUtils;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 /**
  * The ShellCommandsControllerJUnitTest class is a test suite of test cases testing the contract
and functionality of the
@@ -74,7 +73,7 @@ public class ShellCommandsControllerJUnitTest {
     controller = null;
   }
 
-  protected List<String> getCliCommands() {
+  private List<String> getCliCommands() {
     try {
       Set<Class<?>> commandClasses = ClasspathScanLoadHelper.loadAndGet(
         "com.gemstone.gemfire.management.internal.cli.commands", CommandMarker.class, true);
@@ -101,7 +100,7 @@ public class ShellCommandsControllerJUnitTest {
     }
   }
 
-  protected List<String> getControllerWebServiceEndpoints() {
+  private List<String> getControllerWebServiceEndpoints() {
     RequestAttributes requestAttrs = RequestContextHolder.getRequestAttributes();
     HttpServletRequest servletRequest = ((ServletRequestAttributes) requestAttrs).getRequest();
     String scheme = servletRequest.getScheme();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index ef405db..f9d9d35 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -24,11 +24,8 @@ import java.util.Iterator;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
 import edu.umd.cs.mtc.MultithreadedTestCase;
 import edu.umd.cs.mtc.TestFramework;
-
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.lib.concurrent.Synchroniser;
@@ -38,6 +35,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
 /**
  * The LoginHandlerInterceptorJUnitTest class is a test suite of test cases to test the contract
  * and functionality of the Spring HandlerInterceptor, LoginHandlerInterceptor class.
@@ -65,11 +64,11 @@ public class LoginHandlerInterceptorJUnitTest {
     mockContext = null;
   }
 
-  protected String createEnvironmentVariable(final String name) {
+  private String createEnvironmentVariable(final String name) {
     return (LoginHandlerInterceptor.ENVIRONMENT_VARIABLE_REQUEST_PARAMETER_PREFIX + name);
   }
 
-  protected <T> Enumeration<T> enumeration(final Iterator<T> iterator)
{
+  private <T> Enumeration<T> enumeration(final Iterator<T> iterator) {
     return new Enumeration<T>() {
       public boolean hasMoreElements() {
         return iterator.hasNext();
@@ -128,7 +127,7 @@ public class LoginHandlerInterceptorJUnitTest {
     TestFramework.runOnce(new HandlerInterceptorThreadSafetyMultiThreadedTestCase());
   }
 
-  protected final class HandlerInterceptorThreadSafetyMultiThreadedTestCase extends MultithreadedTestCase
{
+  private final class HandlerInterceptorThreadSafetyMultiThreadedTestCase extends MultithreadedTestCase
{
 
     private LoginHandlerInterceptor handlerInterceptor;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
index 60165d7..0e2cd0c 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
@@ -25,10 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.gemstone.gemfire.management.internal.web.AbstractWebTestCase;
-import com.gemstone.gemfire.management.internal.web.domain.Link;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
 import org.jmock.Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.After;
@@ -40,6 +36,10 @@ import org.springframework.http.MediaType;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import com.gemstone.gemfire.management.internal.web.AbstractWebTestCase;
+import com.gemstone.gemfire.management.internal.web.domain.Link;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
 /**
  * The ClientHttpRequestJUnitTest class is a test suite of test cases testing the contract
and functionality of the
  * ClientHttpRequest class.
@@ -494,12 +494,12 @@ public class ClientHttpRequestJUnitTest extends AbstractWebTestCase
{
   }
 
   @SuppressWarnings("unused")
-  protected static interface Library {
+  private static interface Library {
     public String getName();
   }
 
   @SuppressWarnings("unused")
-  protected static interface Book {
+  private static interface Book {
     public String getAuthor();
     public String getIsbn();
     public String getTitle();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
index 81f3e31..1b317c2 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
@@ -24,9 +24,6 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.Calendar;
 
-import com.gemstone.gemfire.internal.util.IOUtils;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
@@ -39,6 +36,9 @@ import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 
+import com.gemstone.gemfire.internal.util.IOUtils;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
 /**
  * The SerializableObjectHttpMessageConverterJUnitTest class is a test suite of test cases
testing the contract
  * and functionality of the SerializableObjectHttpMessageConverter class.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
index 15f9a29..bcc3cef 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
@@ -24,15 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.gemstone.gemfire.internal.lang.StringUtils;
-import com.gemstone.gemfire.management.internal.cli.CommandRequest;
-import com.gemstone.gemfire.management.internal.web.AbstractWebTestCase;
-import com.gemstone.gemfire.management.internal.web.domain.Link;
-import com.gemstone.gemfire.management.internal.web.domain.LinkIndex;
-import com.gemstone.gemfire.management.internal.web.http.ClientHttpRequest;
-import com.gemstone.gemfire.management.internal.web.http.HttpMethod;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,6 +33,15 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.ResourceAccessException;
 
+import com.gemstone.gemfire.internal.lang.StringUtils;
+import com.gemstone.gemfire.management.internal.cli.CommandRequest;
+import com.gemstone.gemfire.management.internal.web.AbstractWebTestCase;
+import com.gemstone.gemfire.management.internal.web.domain.Link;
+import com.gemstone.gemfire.management.internal.web.domain.LinkIndex;
+import com.gemstone.gemfire.management.internal.web.http.ClientHttpRequest;
+import com.gemstone.gemfire.management.internal.web.http.HttpMethod;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
 /**
  * The RestHttpOperationInvokerJUnitTest class is a test suite of test cases testing the
contract and functionality of the
  * RestHttpOperationInvoker class.
@@ -107,28 +107,28 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase
{
     operationInvoker = null;
   }
 
-  protected CommandRequest createCommandRequest(final String command, final Map<String,
String> options) {
+  private CommandRequest createCommandRequest(final String command, final Map<String,
String> options) {
     return new TestCommandRequest(command, options, Collections.<String, String>emptyMap(),
null);
   }
 
-  protected CommandRequest createCommandRequest(final String command, final Map<String,
String> options, final Map<String, String> environment) {
+  private CommandRequest createCommandRequest(final String command, final Map<String,
String> options, final Map<String, String> environment) {
     return new TestCommandRequest(command, options, environment, null);
   }
 
-  protected CommandRequest createCommandRequest(final String command, final Map<String,
String> options, final byte[][] fileData) {
+  private CommandRequest createCommandRequest(final String command, final Map<String,
String> options, final byte[][] fileData) {
     return new TestCommandRequest(command, options, Collections.<String, String>emptyMap(),
fileData);
   }
 
-  protected CommandRequest createCommandRequest(final String command, final Map<String,
String> options, final Map<String, String> environment, final byte[][] fileData)
{
+  private CommandRequest createCommandRequest(final String command, final Map<String,
String> options, final Map<String, String> environment, final byte[][] fileData)
{
     return new TestCommandRequest(command, options, environment, fileData);
   }
 
-  protected LinkIndex getLinkIndex() {
+  private LinkIndex getLinkIndex() {
     assertTrue("The LinkIndex was not property initialized!", linkIndex != null);
     return linkIndex;
   }
 
-  protected RestHttpOperationInvoker getOperationInvoker() {
+  private RestHttpOperationInvoker getOperationInvoker() {
     assertTrue("The RestHttpOperationInvoker was not properly initialized!", operationInvoker
!= null);
     return operationInvoker;
   }
@@ -412,7 +412,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase
{
     }
   }
 
-  protected static final class TestCommandRequest extends CommandRequest {
+  private static final class TestCommandRequest extends CommandRequest {
 
     private final Map<String, String> commandParameters = new TreeMap<String, String>();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
index 2e8d118..74ed09e 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
@@ -64,16 +64,16 @@ public class SimpleHttpOperationInvokerJUnitTest extends AbstractWebTestCase
{
     operationInvoker = null;
   }
 
-  protected CommandRequest createCommandRequest(final String command) {
+  private CommandRequest createCommandRequest(final String command) {
     return new TestCommandRequest(command);
   }
 
-  protected String getExpectedHttpRequestUrl(final CommandRequest command) {
+  private String getExpectedHttpRequestUrl(final CommandRequest command) {
     return SimpleHttpOperationInvoker.REST_API_URL.concat(SimpleHttpOperationInvoker.REST_API_MANAGEMENT_COMMANDS_URI)
       .concat("?").concat(SimpleHttpOperationInvoker.CMD_QUERY_PARAMETER).concat("=").concat(command.getInput());
   }
 
-  protected SimpleHttpOperationInvoker getOperationInvoker() {
+  private SimpleHttpOperationInvoker getOperationInvoker() {
     return operationInvoker;
   }
 
@@ -179,7 +179,7 @@ public class SimpleHttpOperationInvokerJUnitTest extends AbstractWebTestCase
{
     }
   }
 
-  protected static final class TestCommandRequest extends CommandRequest {
+  private static final class TestCommandRequest extends CommandRequest {
 
     private final String command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
index 08314f8..180641c 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
@@ -45,7 +45,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Category(UnitTest.class)
 public class ConvertUtilsJUnitTest {
 
-  protected MultipartFile createMultipartFile(final String filename, final byte[] content)
{
+  private MultipartFile createMultipartFile(final String filename, final byte[] content)
{
     return new MultipartFileAdapter() {
       @Override public byte[] getBytes() throws IOException {
         return content;
@@ -65,7 +65,7 @@ public class ConvertUtilsJUnitTest {
     };
   }
 
-  protected Resource createResource(final String filename, final byte[] content) {
+  private Resource createResource(final String filename, final byte[] content) {
     return new ByteArrayResource(content, String.format("Content of file (%1$s).", filename))
{
       @Override public String getFilename() {
         return filename;


Mime
View raw message