You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2017/06/19 22:17:53 UTC

[09/29] geode git commit: GEODE-2626: fix FastLoggerJUnitTest use of Mockito 2.7.11

GEODE-2626: fix FastLoggerJUnitTest use of Mockito 2.7.11


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

Branch: refs/heads/feature/GEODE-2804
Commit: 4121261ea835be31809e62dc87aa011a315f0ab2
Parents: 7dcd775
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Jun 13 11:00:07 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 13:47:56 2017 -0700

----------------------------------------------------------------------
 .../apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/4121261e/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
index e162087..891ac3c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.logging.log4j;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.*;
 
 import org.apache.logging.log4j.Level;
@@ -97,7 +96,7 @@ public class FastLoggerJUnitTest {
 
     assertThat(fastLogger.isDebugEnabled(), is(true));
     assertThat(fastLogger.isDebugEnabled(this.mockedMarker), is(true));
-    verify(this.mockedLogger, times(1)).isEnabled(eq(Level.DEBUG), any(Marker.class),
+    verify(this.mockedLogger, times(1)).isEnabled(eq(Level.DEBUG), isNull(Marker.class),
         isNull(String.class));
     verify(this.mockedLogger, times(1)).isEnabled(eq(Level.DEBUG), eq(this.mockedMarker),
         isNull(Object.class), isNull(Throwable.class));