geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject geode git commit: fix format and change to mockito 2.8.9
Date Wed, 14 Jun 2017 17:34:58 GMT
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-2558 73322ca3a -> c3859b986


fix format and change to mockito 2.8.9


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

Branch: refs/heads/feature/GEODE-2558
Commit: c3859b986058a60f8726910495f18940b6f7bf92
Parents: 73322ca
Author: Kirk Lund <klund@apache.org>
Authored: Wed Jun 14 10:34:39 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Wed Jun 14 10:34:39 2017 -0700

----------------------------------------------------------------------
 .../geode/internal/cache/tier/sockets/command/Put65Test.java   | 3 ++-
 .../geode/internal/cache/tier/sockets/command/PutTest.java     | 3 ++-
 .../apache/geode/internal/statistics/StatisticsImplTest.java   | 6 ++----
 gradle/dependency-versions.properties                          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/c3859b98/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
index 3f4df91..8d52b88 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
@@ -121,7 +121,8 @@ public class Put65Test {
 
     when(this.keyPart.getStringOrObject()).thenReturn(KEY);
 
-    when(this.localRegion.basicBridgePut(eq(KEY), eq(VALUE), eq(null), eq(true), eq(CALLBACK_ARG),
any(), eq(true), any())).thenReturn(true);
+    when(this.localRegion.basicBridgePut(eq(KEY), eq(VALUE), eq(null), eq(true), eq(CALLBACK_ARG),
+        any(), eq(true), any())).thenReturn(true);
 
     when(this.message.getNumberOfParts()).thenReturn(8);
     when(this.message.getPart(eq(0))).thenReturn(this.regionNamePart);

http://git-wip-us.apache.org/repos/asf/geode/blob/c3859b98/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
index 0d410b3..6f894cf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
@@ -129,7 +129,8 @@ public class PutTest {
     when(this.serverConnection.getErrorResponseMessage()).thenReturn(this.errorResponseMessage);
     when(this.serverConnection.getClientVersion()).thenReturn(Version.CURRENT);
 
-    when(this.localRegion.basicBridgePut(eq(KEY), eq(VALUE), isNull(), eq(true), eq(CALLBACK_ARG),
any(), anyBoolean(), any())).thenReturn(true);
+    when(this.localRegion.basicBridgePut(eq(KEY), eq(VALUE), isNull(), eq(true), eq(CALLBACK_ARG),
+        any(), anyBoolean(), any())).thenReturn(true);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/geode/blob/c3859b98/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
index 2747252..8b2a9b4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
@@ -128,14 +128,12 @@ public class StatisticsImplTest {
     assertEquals(1, stats.invokeSuppliers());
 
     // String message, Object p0, Object p1, Object p2
-    verify(logger, times(1)).warn(anyString(), isNull(), anyInt(),
-        isA(NullPointerException.class));
+    verify(logger, times(1)).warn(anyString(), isNull(), anyInt(), isA(NullPointerException.class));
 
     assertEquals(1, stats.invokeSuppliers());
 
     // Make sure the logger isn't invoked again
-    verify(logger, times(1)).warn(anyString(), isNull(), anyInt(),
-        isA(NullPointerException.class));
+    verify(logger, times(1)).warn(anyString(), isNull(), anyInt(), isA(NullPointerException.class));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/geode/blob/c3859b98/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 56764cb..d300748 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -66,7 +66,7 @@ JUnitParams.version = 1.0.6
 log4j.version = 2.7
 lucene.version = 6.4.1
 codec.version = 1.10
-mockito-core.version = 2.7.11
+mockito-core.version = 2.8.9
 mockrunner.version = 1.1.2
 mortbay-jetty-servlet-api.version=3.0.20100224
 multithreadedtc.version = 1.01


Mime
View raw message