You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2014/09/28 06:02:28 UTC
git commit: HBASE-11957 addendum 2; fix TestAssignmentManager
Repository: hbase
Updated Branches:
refs/heads/0.94 b4e1be5b4 -> 9f5c397e2
HBASE-11957 addendum 2; fix TestAssignmentManager
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9f5c397e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9f5c397e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9f5c397e
Branch: refs/heads/0.94
Commit: 9f5c397e27c79124366041b3a93b49aa85abb2be
Parents: b4e1be5
Author: Lars Hofhansl <la...@apache.org>
Authored: Sat Sep 27 21:02:37 2014 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Sat Sep 27 21:02:37 2014 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/TestAssignmentManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9f5c397e/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java b/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
index 2f9779f..6d1b589 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
@@ -597,7 +597,7 @@ public class TestAssignmentManager {
Mockito.when(implementation.openScanner((byte [])Mockito.any(), (Scan)Mockito.any())).
thenReturn(System.currentTimeMillis());
// Return a good result first and then return null to indicate end of scan
- Mockito.when(implementation.next(Mockito.anyLong(), Mockito.anyInt())).
+ Mockito.when(implementation.next(Mockito.anyLong(), Mockito.anyInt(), Mockito.anyInt())).
thenReturn(new Result [] {r}, (Result [])null);
// Get a connection w/ mocked up common methods.
@@ -835,14 +835,14 @@ public class TestAssignmentManager {
Mockito.when(ri .openScanner((byte[]) Mockito.any(), (Scan) Mockito.any())).
thenReturn(System.currentTimeMillis());
if (enabling) {
- Mockito.when(ri.next(Mockito.anyLong(), Mockito.anyInt())).thenReturn(result, result, result,
+ Mockito.when(ri.next(Mockito.anyLong(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(result, result, result,
(Result[]) null);
// If a get, return the above result too for REGIONINFO_2
Mockito.when(ri.get((byte[]) Mockito.any(), (Get) Mockito.any())).thenReturn(
getMetaTableRowResult(REGIONINFO_2, SERVERNAME_A));
} else {
// Return good result 'r' first and then return null to indicate end of scan
- Mockito.when(ri.next(Mockito.anyLong(), Mockito.anyInt())).thenReturn(new Result[] { r });
+ Mockito.when(ri.next(Mockito.anyLong(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(new Result[] { r });
// If a get, return the above result too for REGIONINFO
Mockito.when(ri.get((byte[]) Mockito.any(), (Get) Mockito.any())).thenReturn(r);
}