ACCUMULO-2649 Move the new test class to the new mapreduce module
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6e89aae5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6e89aae5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6e89aae5 Branch: refs/heads/master Commit: 6e89aae581cc0fccc6140b1430220c566281f99f Parents: 28f97db Author: Josh Elser <els...@apache.org> Authored: Thu Jun 26 16:22:40 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 26 16:22:40 2014 -0400 ---------------------------------------------------------------------- .../core/client/mapred/RangeInputSplitTest.java | 105 ------------------- .../core/client/mapred/RangeInputSplitTest.java | 105 +++++++++++++++++++ 2 files changed, 105 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6e89aae5/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java deleted file mode 100644 index 3f72164..0000000 --- a/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.core.client.mapred; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Range; -import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.util.Pair; -import org.apache.hadoop.io.Text; -import org.apache.log4j.Level; -import org.junit.Assert; -import org.junit.Test; - -public class RangeInputSplitTest { - - @Test - public void testSimpleWritable() throws IOException { - RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[]{"localhost"}); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(baos); - split.write(dos); - - RangeInputSplit newSplit = new RangeInputSplit(); - - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - DataInputStream dis = new DataInputStream(bais); - newSplit.readFields(dis); - - Assert.assertEquals(split.getRange(), newSplit.getRange()); - Assert.assertTrue(Arrays.equals(split.getLocations(), newSplit.getLocations())); - } - - @Test - public void testAllFieldsWritable() throws IOException { - RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[]{"localhost"}); - - Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>(); - - fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1"))); - fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2"))); - - split.setAuths(new Authorizations("foo")); - split.setOffline(true); - split.setIsolatedScan(true); - split.setUsesLocalIterators(true); - split.setFetchedColumns(fetchedColumns); - split.setToken(new PasswordToken("password")); - split.setPrincipal("root"); - split.setInstanceName("instance"); - split.setMockInstance(true); - split.setZooKeepers("localhost"); - split.setLogLevel(Level.WARN); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(baos); - split.write(dos); - - RangeInputSplit newSplit = new RangeInputSplit(); - - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - DataInputStream dis = new DataInputStream(bais); - newSplit.readFields(dis); - - Assert.assertEquals(split.getRange(), newSplit.getRange()); - Assert.assertArrayEquals(split.getLocations(), newSplit.getLocations()); - - Assert.assertEquals(split.getAuths(), newSplit.getAuths()); - Assert.assertEquals(split.isOffline(), newSplit.isOffline()); - Assert.assertEquals(split.isIsolatedScan(), newSplit.isOffline()); - Assert.assertEquals(split.usesLocalIterators(), newSplit.usesLocalIterators()); - Assert.assertEquals(split.getFetchedColumns(), newSplit.getFetchedColumns()); - Assert.assertEquals(split.getToken(), newSplit.getToken()); - Assert.assertEquals(split.getPrincipal(), newSplit.getPrincipal()); - Assert.assertEquals(split.getInstanceName(), newSplit.getInstanceName()); - Assert.assertEquals(split.isMockInstance(), newSplit.isMockInstance()); - Assert.assertEquals(split.getZooKeepers(), newSplit.getZooKeepers()); - Assert.assertEquals(split.getLogLevel(), newSplit.getLogLevel()); - } - -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/6e89aae5/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java new file mode 100644 index 0000000..3f72164 --- /dev/null +++ b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java @@ -0,0 +1,105 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.core.client.mapred; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.util.Pair; +import org.apache.hadoop.io.Text; +import org.apache.log4j.Level; +import org.junit.Assert; +import org.junit.Test; + +public class RangeInputSplitTest { + + @Test + public void testSimpleWritable() throws IOException { + RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[]{"localhost"}); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + split.write(dos); + + RangeInputSplit newSplit = new RangeInputSplit(); + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + DataInputStream dis = new DataInputStream(bais); + newSplit.readFields(dis); + + Assert.assertEquals(split.getRange(), newSplit.getRange()); + Assert.assertTrue(Arrays.equals(split.getLocations(), newSplit.getLocations())); + } + + @Test + public void testAllFieldsWritable() throws IOException { + RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[]{"localhost"}); + + Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>(); + + fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1"))); + fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2"))); + + split.setAuths(new Authorizations("foo")); + split.setOffline(true); + split.setIsolatedScan(true); + split.setUsesLocalIterators(true); + split.setFetchedColumns(fetchedColumns); + split.setToken(new PasswordToken("password")); + split.setPrincipal("root"); + split.setInstanceName("instance"); + split.setMockInstance(true); + split.setZooKeepers("localhost"); + split.setLogLevel(Level.WARN); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + split.write(dos); + + RangeInputSplit newSplit = new RangeInputSplit(); + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + DataInputStream dis = new DataInputStream(bais); + newSplit.readFields(dis); + + Assert.assertEquals(split.getRange(), newSplit.getRange()); + Assert.assertArrayEquals(split.getLocations(), newSplit.getLocations()); + + Assert.assertEquals(split.getAuths(), newSplit.getAuths()); + Assert.assertEquals(split.isOffline(), newSplit.isOffline()); + Assert.assertEquals(split.isIsolatedScan(), newSplit.isOffline()); + Assert.assertEquals(split.usesLocalIterators(), newSplit.usesLocalIterators()); + Assert.assertEquals(split.getFetchedColumns(), newSplit.getFetchedColumns()); + Assert.assertEquals(split.getToken(), newSplit.getToken()); + Assert.assertEquals(split.getPrincipal(), newSplit.getPrincipal()); + Assert.assertEquals(split.getInstanceName(), newSplit.getInstanceName()); + Assert.assertEquals(split.isMockInstance(), newSplit.isMockInstance()); + Assert.assertEquals(split.getZooKeepers(), newSplit.getZooKeepers()); + Assert.assertEquals(split.getLogLevel(), newSplit.getLogLevel()); + } + +}
