geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject incubator-geode git commit: Fix up
Date Fri, 18 Mar 2016 21:34:38 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1050 072f66946 -> 9c8f1cde1


Fix up


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9c8f1cde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9c8f1cde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9c8f1cde

Branch: refs/heads/feature/GEODE-1050
Commit: 9c8f1cde1a369606dc0f6ac7fd797e426520bbf4
Parents: 072f669
Author: Kirk Lund <klund@apache.org>
Authored: Fri Mar 18 14:29:06 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Fri Mar 18 14:29:06 2016 -0700

----------------------------------------------------------------------
 .../cache/tier/sockets/InterestRegrListenerDUnitTest.java      | 2 +-
 .../gemfire/test/dunit/internal/JUnit3DistributedTestCase.java | 4 ----
 .../gemfire/test/dunit/internal/JUnit4DistributedTestCase.java | 2 +-
 .../com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java  | 4 ++--
 .../cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java    | 6 ++----
 .../internal/cache/tier/sockets/DurableClientTestCase.java     | 2 --
 .../gemfire/management/CacheServerManagementDUnitTest.java     | 2 +-
 7 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index 4f3b813..6b48cef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
@@ -74,7 +74,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase {
   private static final long serialVersionUID = 1L;
 
   @Override
-  public final void postSetUp() throws Exception {
+  public final void preSetUp() throws Exception {
     disconnectAllFromDS();
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
index 2f120de..f453e7e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
@@ -149,10 +149,6 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements
Dist
     return JUnit4DistributedTestCase.getTestMethodName();
   }
 
-  public static void setTestMethodName(final String testMethodName) { // TODO: delete
-    JUnit4DistributedTestCase.setTestMethodName(testMethodName);
-  }
-
   /**
    * Returns a unique name for this test method.  It is based on the
    * name of the class as well as the name of the method.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
index ad1e01a..809fbd3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -325,7 +325,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture,
Serial
     return testMethodName;
   }
 
-  public static final void setTestMethodName(final String testMethodName) { // TODO: delete
+  private static final void setTestMethodName(final String testMethodName) {
     JUnit4DistributedTestCase.testMethodName = testMethodName;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
index 453b029..b10f610 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
@@ -41,13 +41,13 @@ public class BasicDUnitTest extends DistributedTestCase {
   }
 
   @Override
-  public void postSetUp() throws Exception {
+  public final void postSetUp() throws Exception {
     bindings = new Properties();
     invokeInEveryVM(() -> bindings = new Properties());
   }
 
   @Override
-  public void postTearDown() throws Exception {
+  public final void postTearDown() throws Exception {
     bindings = null;
     invokeInEveryVM(() -> bindings = null);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 5388f62..4591ea6 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -22,12 +22,11 @@ import java.util.Set;
 
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.query.CqQuery;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
 import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
 import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
-import com.gemstone.gemfire.cache.query.internal.cq.CqService;
 import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
@@ -40,10 +39,9 @@ import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
-import junit.framework.TestResult;
 
 /**
- * This class tests the ContiunousQuery mechanism in GemFire.
+ * This class tests the ContinuousQuery mechanism in GemFire.
  *
  * @author anil
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/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 34cb30d..3ce9658 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
@@ -102,8 +102,6 @@ public class DurableClientTestCase extends DistributedTestCase {
     this.regionName = getName() + "_region";
     //Clients see this when the servers disconnect
     IgnoredException.addIgnoredException("Could not find any server");
-    setTestMethodName(getName());
-    assertEquals(getName(), getTestMethodName());
     System.out.println("\n\n[setup] START TEST " + getClass().getSimpleName()+"."+ getTestMethodName()+"\n\n");
     postSetUpDurableClientTestCase();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9c8f1cde/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 b4006ba..379f57d 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
@@ -89,7 +89,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase {
   }
 
   @Override
-  public final void postSetUp() throws Exception {
+  public final void preSetUp() throws Exception {
     disconnectAllFromDS();
   }
 


Mime
View raw message