http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/graph/TestAggregatorsHandling.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/graph/TestAggregatorsHandling.java b/giraph/src/test/java/org/apache/giraph/graph/TestAggregatorsHandling.java index d4b8bd9..7ef436e 100644 --- a/giraph/src/test/java/org/apache/giraph/graph/TestAggregatorsHandling.java +++ b/giraph/src/test/java/org/apache/giraph/graph/TestAggregatorsHandling.java @@ -19,22 +19,21 @@ package org.apache.giraph.graph; import org.apache.giraph.BspCase; -import org.apache.giraph.GiraphConfiguration; -import org.apache.giraph.ImmutableClassesGiraphConfiguration; +import org.apache.giraph.conf.GiraphClasses; +import org.apache.giraph.conf.GiraphConstants; +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.aggregators.DoubleOverwriteAggregator; import org.apache.giraph.aggregators.LongSumAggregator; import org.apache.giraph.comm.aggregators.AggregatorUtils; import org.apache.giraph.examples.AggregatorsTestVertex; import org.apache.giraph.examples.SimpleCheckpointVertex; import org.apache.giraph.examples.SimplePageRankVertex; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.DoubleWritable; +import org.apache.hadoop.io.FloatWritable; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Writable; -import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.util.Progressable; -import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -76,9 +75,12 @@ public class TestAggregatorsHandling extends BspCase { @Test public void testAggregatorsHandling() throws IOException, ClassNotFoundException, InterruptedException { - GiraphJob job = prepareJob(getCallingMethodName(), - AggregatorsTestVertex.class, + GiraphClasses<LongWritable, DoubleWritable, FloatWritable, DoubleWritable> + classes = new GiraphClasses(); + classes.setVertexClass(AggregatorsTestVertex.class); + classes.setVertexInputFormatClass( SimplePageRankVertex.SimplePageRankVertexInputFormat.class); + GiraphJob job = prepareJob(getCallingMethodName(), classes); job.getConfiguration().setMasterComputeClass( AggregatorsTestVertex.AggregatorsTestMasterCompute.class); // test with aggregators split in a few requests @@ -154,18 +156,19 @@ public class TestAggregatorsHandling extends BspCase { IOException, InterruptedException { Path checkpointsDir = getTempPath("checkPointsForTesting"); Path outputPath = getTempPath(getCallingMethodName()); - GiraphJob job = prepareJob(getCallingMethodName(), - AggregatorsTestVertex.class, - null, - AggregatorsTestVertex.AggregatorsTestMasterCompute.class, - SimplePageRankVertex.SimplePageRankVertexInputFormat.class, - null, - outputPath); - - job.getConfiguration().set(GiraphConfiguration.CHECKPOINT_DIRECTORY, + GiraphClasses<LongWritable, DoubleWritable, FloatWritable, DoubleWritable> + classes = new GiraphClasses(); + classes.setVertexClass(AggregatorsTestVertex.class); + classes.setMasterComputeClass( + AggregatorsTestVertex.AggregatorsTestMasterCompute.class); + classes.setVertexInputFormatClass( + SimplePageRankVertex.SimplePageRankVertexInputFormat.class); + GiraphJob job = prepareJob(getCallingMethodName(), classes, outputPath); + + job.getConfiguration().set(GiraphConstants.CHECKPOINT_DIRECTORY, checkpointsDir.toString()); job.getConfiguration().setBoolean( - GiraphConfiguration.CLEANUP_CHECKPOINTS_AFTER_SUCCESS, false); + GiraphConstants.CLEANUP_CHECKPOINTS_AFTER_SUCCESS, false); job.getConfiguration().setCheckpointFrequency(4); assertTrue(job.run(true)); @@ -174,19 +177,20 @@ public class TestAggregatorsHandling extends BspCase { System.out.println("testAggregatorsCheckpointing: Restarting from " + "superstep 4 with checkpoint path = " + checkpointsDir); outputPath = getTempPath(getCallingMethodName() + "Restarted"); + classes = new GiraphClasses(); + classes.setVertexClass(AggregatorsTestVertex.class); + classes.setMasterComputeClass( + AggregatorsTestVertex.AggregatorsTestMasterCompute.class); + classes.setVertexInputFormatClass( + SimplePageRankVertex.SimplePageRankVertexInputFormat.class); GiraphJob restartedJob = prepareJob(getCallingMethodName() + "Restarted", - AggregatorsTestVertex.class, - null, - AggregatorsTestVertex.AggregatorsTestMasterCompute.class, - SimplePageRankVertex.SimplePageRankVertexInputFormat.class, - null, - outputPath); + classes, outputPath); job.getConfiguration().setMasterComputeClass( SimpleCheckpointVertex.SimpleCheckpointVertexMasterCompute.class); restartedJob.getConfiguration().set( - GiraphConfiguration.CHECKPOINT_DIRECTORY, checkpointsDir.toString()); + GiraphConstants.CHECKPOINT_DIRECTORY, checkpointsDir.toString()); restartedJob.getConfiguration().setLong( - GiraphConfiguration.RESTART_SUPERSTEP, 4); + GiraphConstants.RESTART_SUPERSTEP, 4); assertTrue(restartedJob.run(true)); }
http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/graph/TestMutableVertex.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/graph/TestMutableVertex.java b/giraph/src/test/java/org/apache/giraph/graph/TestMutableVertex.java index 4407777..d1de2ba 100644 --- a/giraph/src/test/java/org/apache/giraph/graph/TestMutableVertex.java +++ b/giraph/src/test/java/org/apache/giraph/graph/TestMutableVertex.java @@ -17,13 +17,8 @@ */ package org.apache.giraph.graph; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import java.io.IOException; -import java.util.Collection; -import java.util.Map; -import org.apache.giraph.GiraphConfiguration; -import org.apache.giraph.ImmutableClassesGiraphConfiguration; +import org.apache.giraph.conf.GiraphConfiguration; +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.utils.DynamicChannelBufferInputStream; import org.apache.giraph.utils.DynamicChannelBufferOutputStream; import org.apache.giraph.utils.SystemTime; @@ -39,7 +34,17 @@ import org.apache.hadoop.io.LongWritable; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + +import java.io.IOException; +import java.util.Collection; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * Test all the mutable vertices http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/graph/partition/TestPartitionStores.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/graph/partition/TestPartitionStores.java b/giraph/src/test/java/org/apache/giraph/graph/partition/TestPartitionStores.java index 241c629..098899b 100644 --- a/giraph/src/test/java/org/apache/giraph/graph/partition/TestPartitionStores.java +++ b/giraph/src/test/java/org/apache/giraph/graph/partition/TestPartitionStores.java @@ -18,8 +18,9 @@ package org.apache.giraph.graph.partition; -import org.apache.giraph.GiraphConfiguration; -import org.apache.giraph.ImmutableClassesGiraphConfiguration; +import org.apache.giraph.conf.GiraphConfiguration; +import org.apache.giraph.conf.GiraphConstants; +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.graph.IntIntNullIntVertex; import org.apache.giraph.graph.Vertex; import org.apache.giraph.utils.UnsafeByteArrayInputStream; @@ -30,16 +31,15 @@ import org.apache.hadoop.mapreduce.Mapper; import org.junit.Before; import org.junit.Test; +import com.google.common.collect.Iterables; + +import java.io.IOException; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - -import java.io.IOException; - /** * Test case for partition stores. */ @@ -130,15 +130,15 @@ public class TestPartitionStores { @Test public void testDiskBackedPartitionStore() { - conf.setBoolean(GiraphConfiguration.USE_OUT_OF_CORE_GRAPH, true); - conf.setInt(GiraphConfiguration.MAX_PARTITIONS_IN_MEMORY, 1); + conf.setBoolean(GiraphConstants.USE_OUT_OF_CORE_GRAPH, true); + conf.setInt(GiraphConstants.MAX_PARTITIONS_IN_MEMORY, 1); PartitionStore<IntWritable, IntWritable, NullWritable, IntWritable> partitionStore = new DiskBackedPartitionStore<IntWritable, IntWritable, NullWritable, IntWritable>(conf, context); testReadWrite(partitionStore, conf); - conf.setInt(GiraphConfiguration.MAX_PARTITIONS_IN_MEMORY, 2); + conf.setInt(GiraphConstants.MAX_PARTITIONS_IN_MEMORY, 2); partitionStore = new DiskBackedPartitionStore<IntWritable, IntWritable, NullWritable, IntWritable>(conf, context); testReadWrite(partitionStore, conf); http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java b/giraph/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java index 0bee712..b03c8e4 100644 --- a/giraph/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java +++ b/giraph/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java @@ -18,10 +18,9 @@ package org.apache.giraph.io; -import org.apache.giraph.GiraphConfiguration; +import org.apache.giraph.conf.GiraphConstants; import org.apache.giraph.graph.Edge; import org.apache.giraph.graph.EdgeListVertex; -import org.apache.giraph.graph.GiraphJob; import org.apache.giraph.graph.GraphState; import org.apache.giraph.graph.Vertex; import org.apache.hadoop.conf.Configuration; @@ -36,6 +35,8 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.junit.Before; import org.junit.Test; +import java.io.IOException; + import static org.apache.giraph.io.TestTextDoubleDoubleAdjacencyListVertexInputFormat.assertValidVertex; import static org.apache.giraph.io.TestTextDoubleDoubleAdjacencyListVertexInputFormat.setGraphState; import static org.junit.Assert.assertEquals; @@ -44,8 +45,6 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.io.IOException; - public class TestLongDoubleDoubleAdjacencyListVertexInputFormat extends LongDoubleDoubleAdjacencyListVertexInputFormat<BooleanWritable> { @@ -59,9 +58,9 @@ public class TestLongDoubleDoubleAdjacencyListVertexInputFormat extends rr = mock(RecordReader.class); when(rr.nextKeyValue()).thenReturn(true); conf = new Configuration(); - conf.setClass(GiraphConfiguration.VERTEX_CLASS, DummyVertex.class, Vertex.class); - conf.setClass(GiraphConfiguration.VERTEX_ID_CLASS, LongWritable.class, Writable.class); - conf.setClass(GiraphConfiguration.VERTEX_VALUE_CLASS, DoubleWritable.class, Writable.class); + conf.setClass(GiraphConstants.VERTEX_CLASS, DummyVertex.class, Vertex.class); + conf.setClass(GiraphConstants.VERTEX_ID_CLASS, LongWritable.class, Writable.class); + conf.setClass(GiraphConstants.VERTEX_VALUE_CLASS, DoubleWritable.class, Writable.class); graphState = mock(GraphState.class); tac = mock(TaskAttemptContext.class); when(tac.getConfiguration()).thenReturn(conf); http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/io/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/io/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java b/giraph/src/test/java/org/apache/giraph/io/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java index f78d2ee..6957872 100644 --- a/giraph/src/test/java/org/apache/giraph/io/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java +++ b/giraph/src/test/java/org/apache/giraph/io/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java @@ -17,7 +17,7 @@ */ package org.apache.giraph.io; -import org.apache.giraph.GiraphConfiguration; +import org.apache.giraph.conf.GiraphConstants; import org.apache.giraph.graph.BspUtils; import org.apache.giraph.graph.Edge; import org.apache.giraph.graph.EdgeListVertex; @@ -36,12 +36,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -52,6 +46,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class TestTextDoubleDoubleAdjacencyListVertexInputFormat extends TextDoubleDoubleAdjacencyListVertexInputFormat<BooleanWritable> { @@ -65,9 +65,9 @@ public class TestTextDoubleDoubleAdjacencyListVertexInputFormat extends rr = mock(RecordReader.class); when(rr.nextKeyValue()).thenReturn(true).thenReturn(false); conf = new Configuration(); - conf.setClass(GiraphConfiguration.VERTEX_CLASS, DummyVertex.class, Vertex.class); - conf.setClass(GiraphConfiguration.VERTEX_ID_CLASS, Text.class, Writable.class); - conf.setClass(GiraphConfiguration.VERTEX_VALUE_CLASS, DoubleWritable.class, Writable.class); + conf.setClass(GiraphConstants.VERTEX_CLASS, DummyVertex.class, Vertex.class); + conf.setClass(GiraphConstants.VERTEX_ID_CLASS, Text.class, Writable.class); + conf.setClass(GiraphConstants.VERTEX_VALUE_CLASS, DoubleWritable.class, Writable.class); graphState = mock(GraphState.class); tac = mock(TaskAttemptContext.class); when(tac.getConfiguration()).thenReturn(conf); http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/utils/BspUtilsTest.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/utils/BspUtilsTest.java b/giraph/src/test/java/org/apache/giraph/utils/BspUtilsTest.java index c581299..68f6553 100644 --- a/giraph/src/test/java/org/apache/giraph/utils/BspUtilsTest.java +++ b/giraph/src/test/java/org/apache/giraph/utils/BspUtilsTest.java @@ -18,8 +18,9 @@ package org.apache.giraph.utils; -import org.apache.giraph.GiraphConfiguration; -import org.apache.giraph.ImmutableClassesGiraphConfiguration; +import org.apache.giraph.conf.GiraphConfiguration; +import org.apache.giraph.conf.GiraphConstants; +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.graph.BspUtils; import org.apache.giraph.graph.EdgeListVertex; import org.apache.hadoop.conf.Configuration; @@ -58,13 +59,13 @@ public class BspUtilsTest { @Before public void setUp() { - conf.setClass(GiraphConfiguration.VERTEX_ID_CLASS, IntWritable.class, + conf.setClass(GiraphConstants.VERTEX_ID_CLASS, IntWritable.class, WritableComparable.class); - conf.setClass(GiraphConfiguration.VERTEX_VALUE_CLASS, LongWritable.class, + conf.setClass(GiraphConstants.VERTEX_VALUE_CLASS, LongWritable.class, Writable.class); - conf.setClass(GiraphConfiguration.EDGE_VALUE_CLASS, DoubleWritable.class, + conf.setClass(GiraphConstants.EDGE_VALUE_CLASS, DoubleWritable.class, Writable.class); - conf.setClass(GiraphConfiguration.MESSAGE_VALUE_CLASS, LongWritable.class, + conf.setClass(GiraphConstants.MESSAGE_VALUE_CLASS, LongWritable.class, Writable.class); GiraphConfiguration conf = new GiraphConfiguration(); conf.setVertexClass(ImmutableVertex.class); http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/org/apache/giraph/utils/MockUtils.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/org/apache/giraph/utils/MockUtils.java b/giraph/src/test/java/org/apache/giraph/utils/MockUtils.java index 7fdc05a..04d2282 100644 --- a/giraph/src/test/java/org/apache/giraph/utils/MockUtils.java +++ b/giraph/src/test/java/org/apache/giraph/utils/MockUtils.java @@ -18,7 +18,7 @@ package org.apache.giraph.utils; -import org.apache.giraph.ImmutableClassesGiraphConfiguration; +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.bsp.CentralizedServiceWorker; import org.apache.giraph.comm.ServerData; import org.apache.giraph.comm.WorkerClientRequestProcessor; http://git-wip-us.apache.org/repos/asf/giraph/blob/599f70e3/giraph/src/test/java/zk/TestZooKeeperManager.java ---------------------------------------------------------------------- diff --git a/giraph/src/test/java/zk/TestZooKeeperManager.java b/giraph/src/test/java/zk/TestZooKeeperManager.java index feb8fa9..41c94a8 100644 --- a/giraph/src/test/java/zk/TestZooKeeperManager.java +++ b/giraph/src/test/java/zk/TestZooKeeperManager.java @@ -17,16 +17,15 @@ */ package zk; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.giraph.GiraphConfiguration; -import org.apache.giraph.graph.GiraphJob; +import org.apache.giraph.conf.GiraphConstants; import org.apache.giraph.zk.ZooKeeperManager; import org.apache.hadoop.conf.Configuration; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class TestZooKeeperManager { @Test public void testGetBasePath() { @@ -36,17 +35,17 @@ public class TestZooKeeperManager { assertEquals("Default value for base path should be empty", "", ZooKeeperManager.getBasePath(conf)); - conf.set(GiraphConfiguration.BASE_ZNODE_KEY, "/howdy"); + conf.set(GiraphConstants.BASE_ZNODE_KEY, "/howdy"); assertEquals("Base path should reflect value of " + - GiraphConfiguration.BASE_ZNODE_KEY, + GiraphConstants.BASE_ZNODE_KEY, "/howdy", ZooKeeperManager.getBasePath(conf)); - conf.set(GiraphConfiguration.BASE_ZNODE_KEY, "no_slash"); + conf.set(GiraphConstants.BASE_ZNODE_KEY, "no_slash"); try { ZooKeeperManager.getBasePath(conf); fail("Should not have allowed path without starting slash"); } catch (IllegalArgumentException iae) { - assertTrue(iae.getMessage().contains(GiraphConfiguration.BASE_ZNODE_KEY)); + assertTrue(iae.getMessage().contains(GiraphConstants.BASE_ZNODE_KEY)); } } }
