accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [4/4] accumulo git commit: ACCUMULO-2232 Fix test
Date Fri, 02 Oct 2015 20:13:32 GMT
ACCUMULO-2232 Fix test


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

Branch: refs/heads/master
Commit: 445f3fe1dc0fb61ec3ac67ed9793f755293eb4f4
Parents: 3444ef7
Author: Keith Turner <kturner@apache.org>
Authored: Fri Oct 2 16:11:33 2015 -0400
Committer: Keith Turner <kturner@apache.org>
Committed: Fri Oct 2 16:11:33 2015 -0400

----------------------------------------------------------------------
 .../accumulo/server/replication/StatusCombinerTest.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/445f3fe1/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
index 26ad8de..7f70a57 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
@@ -24,9 +24,11 @@ import java.util.List;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.IteratorSetting.Column;
+import org.apache.accumulo.core.client.impl.BaseIteratorEnvironment;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.iterators.Combiner;
 import org.apache.accumulo.core.iterators.DevNull;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
 import org.apache.accumulo.server.replication.proto.Replication.Status;
 import org.junit.Assert;
@@ -39,6 +41,13 @@ public class StatusCombinerTest {
   private Key key;
   private Status.Builder builder;
 
+  private static class TestIE extends BaseIteratorEnvironment {
+    @Override
+    public IteratorScope getIteratorScope() {
+      return IteratorScope.scan;
+    }
+  }
+
   @Before
   public void initCombiner() throws IOException {
     key = new Key();
@@ -46,7 +55,7 @@ public class StatusCombinerTest {
     builder = Status.newBuilder();
     IteratorSetting cfg = new IteratorSetting(50, StatusCombiner.class);
     Combiner.setColumns(cfg, Collections.singletonList(new Column(StatusSection.NAME)));
-    combiner.init(new DevNull(), cfg.getOptions(), null);
+    combiner.init(new DevNull(), cfg.getOptions(), new TestIE());
   }
 
   @Test


Mime
View raw message