commit 8a2ec5ebd9afa8a299cfdd5d3cd359898346588a
author Maja Kabiljo <majakabiljo@fb.com> Wed Jul 13 11:05:48 2016 -0700
committer Maja Kabiljo <majakabiljo@fb.com> Wed Jul 13 11:09:59 2016 -0700
tree 1927d41e3c65d4360f7ad3fa6230904cd630bbd2
parent 72562004cfa5106472f61efc5d456788bbc256f9

[GIRAPH-1091] Fix SimpleRangePartitionFactoryTest

Summary: SimpleRangePartitionFactoryTest relied on old logic for calculating number of partitions and got broken with GIRAPH-1082.

Test Plan: Ran the test

Differential Revision: https://reviews.facebook.net/D60747

giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java

diff --git a/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java b/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
index 4bb132b..67863dc 100644
--- a/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
+++ b/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
@@ -38,9 +38,11 @@
 /** Test {@link org.apache.giraph.partition.SimpleLongRangePartitionerFactory}. */
 public class SimpleRangePartitionFactoryTest {
 
-  private void testRange(int numWorkers, int keySpaceSize, int allowedWorkerDiff, boolean emptyWorkers) {
+  private void testRange(int numWorkers, int numPartitions, int keySpaceSize,
+      int allowedWorkerDiff, boolean emptyWorkers) {
     Configuration conf = new Configuration();
     conf.setLong(GiraphConstants.PARTITION_VERTEX_KEY_SPACE_SIZE, keySpaceSize);
+    GiraphConstants.USER_PARTITION_COUNT.set(conf, numPartitions);
     SimpleLongRangePartitionerFactory<Writable, Writable> factory =
         new SimpleLongRangePartitionerFactory<Writable, Writable>();
     factory.setConf(new ImmutableClassesGiraphConfiguration(conf));
@@ -106,14 +108,14 @@
   @Test
   public void testLongRangePartitionerFactory() {
     // perfect distribution
-    testRange(10, 100000, 0, false);
-    testRange(1000, 100000, 0, false);
+    testRange(10, 1000, 100000, 0, false);
+    testRange(1000, 50000, 100000, 0, false);
 
     // perfect distribution even when max is hit, and max is not divisible by #workers
-    testRange(8949, 100023, 0, false);
-    testRange(1949, 211111, 0, false);
+    testRange(8949, (50000 / 8949) * 8949, 100023, 0, false);
+    testRange(1949, (50000 / 1949) * 1949, 211111, 0, false);
 
     // imperfect distribution - because there are more workers than max partitions.
-    testRange(194942, 211111, 1, true);
+    testRange(194942, 50000, 211111, 1, true);
   }
 }