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/02/23 22:39:38 UTC

[1/3] incubator-geode git commit: Remove unused fields

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-953 3e03c1dd6 -> 62b7108b9


Remove unused fields


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

Branch: refs/heads/feature/GEODE-953
Commit: 843eba09fbc015c63dbde4251816b9cbe9e40d1e
Parents: 3e03c1d
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Feb 23 13:22:50 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Feb 23 13:22:50 2016 -0800

----------------------------------------------------------------------
 .../gemfire/test/dunit/rules/DistributedDisconnectRule.java        | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/843eba09/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
index fce5150..47e5175 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
@@ -69,8 +69,6 @@ public class DistributedDisconnectRule extends DistributedExternalResource {
    * Builds an instance of DistributedDisconnectRule
    */
   public static class Builder {
-    private boolean disconnectBeforeClass;
-    private boolean disconnectAfterClass;
     private boolean disconnectBefore;
     private boolean disconnectAfter;
     


[3/3] incubator-geode git commit: Remove dead code and add as(String) clause to assertThat in has*Fields() tests

Posted by kl...@apache.org.
Remove dead code and add as(String) clause to assertThat in has*Fields() tests


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

Branch: refs/heads/feature/GEODE-953
Commit: 62b7108b955bfd9af30cd12705631cb654e78b58
Parents: 9fd6ca1
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Feb 23 13:38:53 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Feb 23 13:38:53 2016 -0800

----------------------------------------------------------------------
 .../rules/serializable/SerializableExternalResourceTest.java   | 6 ++----
 .../rules/serializable/SerializableTemporaryFolderTest.java    | 6 ++----
 .../junit/rules/serializable/SerializableTestNameTest.java     | 6 ++----
 .../junit/rules/serializable/SerializableTestWatcherTest.java  | 6 ++----
 .../test/junit/rules/serializable/SerializableTimeoutTest.java | 6 ++----
 5 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62b7108b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableExternalResourceTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableExternalResourceTest.java b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableExternalResourceTest.java
index 068328b..7c7ee47 100755
--- a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableExternalResourceTest.java
+++ b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableExternalResourceTest.java
@@ -26,6 +26,7 @@ import org.junit.rules.ExternalResource;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 /**
  * Unit tests for {@link SerializableExternalResource}.
@@ -36,10 +37,7 @@ public class SerializableExternalResourceTest {
   @Test
   public void hasZeroFields() throws Exception {
     Field[] fields = ExternalResource.class.getDeclaredFields();
-    /*for (Field field : fields) {
-      System.out.println("Field: " + field);
-    }*/
-    assertThat(fields.length).isEqualTo(0);
+    assertThat(fields.length).as("Fields: " + Arrays.asList(fields)).isEqualTo(1);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62b7108b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTemporaryFolderTest.java b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
index de5b6ce..b52787e 100755
--- a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
+++ b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
@@ -30,6 +30,7 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 /**
  * Unit tests for {@link SerializableTemporaryFolder}.
@@ -43,10 +44,7 @@ public class SerializableTemporaryFolderTest {
   @Test
   public void hasTwoFields() throws Exception {
     Field[] fields = TemporaryFolder.class.getDeclaredFields();
-    /*for (Field field : fields) {
-      System.out.println("Field: " + field);
-    }*/
-    assertThat(fields.length).isEqualTo(2);
+    assertThat(fields.length).as("Fields: " + Arrays.asList(fields)).isEqualTo(2);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62b7108b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestNameTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestNameTest.java b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestNameTest.java
index 3c3b274..9485816 100755
--- a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestNameTest.java
+++ b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestNameTest.java
@@ -29,6 +29,7 @@ import org.junit.runner.Description;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 /**
  * Unit tests for {@link SerializableTestName}.
@@ -39,10 +40,7 @@ public class SerializableTestNameTest {
   @Test
   public void hasOneFields() throws Exception {
     Field[] fields = TestName.class.getDeclaredFields();
-    /*for (Field field : fields) {
-      System.out.println("Field: " + field);
-    }*/
-    assertThat(fields.length).isEqualTo(1);
+    assertThat(fields.length).as("Fields: " + Arrays.asList(fields)).isEqualTo(1);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62b7108b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestWatcherTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestWatcherTest.java b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestWatcherTest.java
index bda7fc5..1e8c1c4 100755
--- a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestWatcherTest.java
+++ b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTestWatcherTest.java
@@ -26,6 +26,7 @@ import org.junit.rules.TestWatcher;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 /**
  * Unit tests for {@link SerializableTestWatcher}.
@@ -36,10 +37,7 @@ public class SerializableTestWatcherTest {
   @Test
   public void hasZeroFields() throws Exception {
     Field[] fields = TestWatcher.class.getDeclaredFields();
-    /*for (Field field : fields) {
-      System.out.println("Field: " + field);
-    }*/
-    assertThat(fields.length).isEqualTo(0);
+    assertThat(fields.length).as("Fields: " + Arrays.asList(fields)).isEqualTo(0);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62b7108b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTimeoutTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTimeoutTest.java b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTimeoutTest.java
index 543676f..c266c63 100755
--- a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTimeoutTest.java
+++ b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/serializable/SerializableTimeoutTest.java
@@ -28,6 +28,7 @@ import org.junit.rules.Timeout;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -39,10 +40,7 @@ public class SerializableTimeoutTest {
   @Test
   public void hasThreeFields() throws Exception {
     Field[] fields = Timeout.class.getDeclaredFields();
-    /*for (Field field : fields) {
-      System.out.println("Field: " + field);
-    }*/
-    assertThat(fields.length).isEqualTo(3);
+    assertThat(fields.length).as("Fields: " + Arrays.asList(fields)).isEqualTo(3);
   }
 
   @Test


[2/3] incubator-geode git commit: Remove unused fields

Posted by kl...@apache.org.
Remove unused fields


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

Branch: refs/heads/feature/GEODE-953
Commit: 9fd6ca1a2157cb25be339a04a7c64ea8075d82d6
Parents: 843eba0
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Feb 23 13:31:20 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Feb 23 13:31:20 2016 -0800

----------------------------------------------------------------------
 .../com/gemstone/gemfire/test/junit/rules/RuleListTest.java | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9fd6ca1a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/RuleListTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/RuleListTest.java b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/RuleListTest.java
index 0ae23f1..ce98dfe 100755
--- a/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/RuleListTest.java
+++ b/geode-junit/src/test/java/com/gemstone/gemfire/test/junit/rules/RuleListTest.java
@@ -134,20 +134,17 @@ public class RuleListTest {
 
     private final String name;
     private final Invocations invocations;
-    private final Throwable beforeClassThrowable;
     private final Throwable beforeThrowable;
 
     SpyRule(String name, Invocations invocations) {
       this.name = name;
       this.invocations = invocations;
-      this.beforeClassThrowable = null;
       this.beforeThrowable = null;
     }
 
     SpyRule(SpyRuleBuilder builder) {
       this.name = builder.name;
       this.invocations = builder.invocations;
-      this.beforeClassThrowable = builder.beforeClassThrowable;
       this.beforeThrowable = builder.beforeThrowable;
     }
 
@@ -185,7 +182,6 @@ public class RuleListTest {
 
     String name;
     Invocations invocations;
-    Throwable beforeClassThrowable;
     Throwable beforeThrowable;
 
     SpyRuleBuilder withName(String name) {
@@ -198,11 +194,6 @@ public class RuleListTest {
       return this;
     }
 
-    SpyRuleBuilder beforeClassThrows(Throwable throwable) {
-      this.beforeClassThrowable = throwable;
-      return this;
-    }
-
     SpyRuleBuilder beforeThrows(Throwable throwable) {
       this.beforeThrowable = throwable;
       return this;