Repository: incubator-beam Updated Branches: refs/heads/master 5f24cef20 -> 529bcdf56
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java index 31447fc..53642f1 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Partition.PartitionFn; @@ -70,8 +70,8 @@ public class PartitionTest implements Serializable { .apply(Create.of(591, 11789, 1257, 24578, 24799, 307)) .apply(Partition.of(2, new ModFn())); assertTrue(outputs.size() == 2); - DataflowAssert.that(outputs.get(0)).containsInAnyOrder(24578); - DataflowAssert.that(outputs.get(1)).containsInAnyOrder(591, 11789, 1257, + PAssert.that(outputs.get(0)).containsInAnyOrder(24578); + PAssert.that(outputs.get(1)).containsInAnyOrder(591, 11789, 1257, 24799, 307); pipeline.run(); } @@ -84,9 +84,9 @@ public class PartitionTest implements Serializable { .apply(Create.of(1, 2, 4, 5)) .apply(Partition.of(3, new ModFn())); assertTrue(outputs.size() == 3); - DataflowAssert.that(outputs.get(0)).empty(); - DataflowAssert.that(outputs.get(1)).containsInAnyOrder(1, 4); - DataflowAssert.that(outputs.get(2)).containsInAnyOrder(2, 5); + PAssert.that(outputs.get(0)).empty(); + PAssert.that(outputs.get(1)).containsInAnyOrder(1, 4); + PAssert.that(outputs.get(2)).containsInAnyOrder(2, 5); pipeline.run(); } @@ -130,7 +130,7 @@ public class PartitionTest implements Serializable { assertTrue(outputs.size() == 2); PCollection<Integer> output = outputs.apply(Flatten.<Integer>pCollections()); - DataflowAssert.that(output).containsInAnyOrder(2, 4, 5, 7, 8, 10, 11); + PAssert.that(output).containsInAnyOrder(2, 4, 5, 7, 8, 10, 11); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java index 6508738..2ae4a1f 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; @@ -64,7 +64,7 @@ public class RemoveDuplicatesTest { PCollection<String> output = input.apply(RemoveDuplicates.<String>create()); - DataflowAssert.that(output) + PAssert.that(output) .containsInAnyOrder("k1", "k5", "k2", "k3"); p.run(); } @@ -83,7 +83,7 @@ public class RemoveDuplicatesTest { PCollection<String> output = input.apply(RemoveDuplicates.<String>create()); - DataflowAssert.that(output).empty(); + PAssert.that(output).empty(); p.run(); } @@ -125,7 +125,7 @@ public class RemoveDuplicatesTest { input.apply(RemoveDuplicates.withRepresentativeValueFn(new Keys())); - DataflowAssert.that(output).satisfies(new Checker()); + PAssert.that(output).satisfies(new Checker()); p.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java index 2342766..a2be424 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.BigEndianIntegerCoder; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.PCollection; @@ -110,7 +110,7 @@ public class SampleTest { PCollection<Iterable<Integer>> output = input.apply( Sample.<Integer>fixedSizeGlobally(3)); - DataflowAssert.thatSingletonIterable(output) + PAssert.thatSingletonIterable(output) .satisfies(new VerifyCorrectSample<>(3, DATA)); p.run(); } @@ -125,7 +125,7 @@ public class SampleTest { PCollection<Iterable<Integer>> output = input.apply( Sample.<Integer>fixedSizeGlobally(3)); - DataflowAssert.thatSingletonIterable(output) + PAssert.thatSingletonIterable(output) .satisfies(new VerifyCorrectSample<>(0, EMPTY)); p.run(); } @@ -140,7 +140,7 @@ public class SampleTest { PCollection<Iterable<Integer>> output = input.apply( Sample.<Integer>fixedSizeGlobally(0)); - DataflowAssert.thatSingletonIterable(output) + PAssert.thatSingletonIterable(output) .satisfies(new VerifyCorrectSample<>(0, DATA)); p.run(); } @@ -155,7 +155,7 @@ public class SampleTest { PCollection<Iterable<Integer>> output = input.apply( Sample.<Integer>fixedSizeGlobally(10)); - DataflowAssert.thatSingletonIterable(output) + PAssert.thatSingletonIterable(output) .satisfies(new VerifyCorrectSample<>(5, DATA)); p.run(); } @@ -180,7 +180,7 @@ public class SampleTest { PCollection<Iterable<Integer>> output = input.apply( Sample.<Integer>fixedSizeGlobally(6)); - DataflowAssert.thatSingletonIterable(output) + PAssert.thatSingletonIterable(output) .satisfies(new VerifyCorrectSample<>(6, REPEATED_DATA)); p.run(); } @@ -225,7 +225,7 @@ public class SampleTest { input.apply(Sample.<String>any(limit)); - DataflowAssert.that(output) + PAssert.that(output) .satisfies(new VerifyAnySample(lines, limit)); p.run(); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java index 0c65357..a9eb7c2 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java @@ -23,7 +23,7 @@ import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.BigEndianIntegerCoder; import com.google.cloud.dataflow.sdk.coders.KvCoder; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.windowing.FixedWindows; import com.google.cloud.dataflow.sdk.transforms.windowing.Window; @@ -104,13 +104,13 @@ public class TopTest { PCollection<KV<String, List<Integer>>> smallestPerKey = inputTable .apply(Top.<String, Integer>smallestPerKey(2)); - DataflowAssert.thatSingletonIterable(top1).containsInAnyOrder(Arrays.asList("bb")); - DataflowAssert.thatSingletonIterable(top2).containsInAnyOrder("z", "c"); - DataflowAssert.thatSingletonIterable(top3).containsInAnyOrder("a", "bb", "c"); - DataflowAssert.that(largestPerKey).containsInAnyOrder( + PAssert.thatSingletonIterable(top1).containsInAnyOrder(Arrays.asList("bb")); + PAssert.thatSingletonIterable(top2).containsInAnyOrder("z", "c"); + PAssert.thatSingletonIterable(top3).containsInAnyOrder("a", "bb", "c"); + PAssert.that(largestPerKey).containsInAnyOrder( KV.of("a", Arrays.asList(3, 2)), KV.of("b", Arrays.asList(100, 10))); - DataflowAssert.that(smallestPerKey).containsInAnyOrder( + PAssert.that(smallestPerKey).containsInAnyOrder( KV.of("a", Arrays.asList(1, 2)), KV.of("b", Arrays.asList(1, 10))); @@ -135,11 +135,11 @@ public class TopTest { PCollection<KV<String, List<Integer>>> smallestPerKey = inputTable .apply(Top.<String, Integer>smallestPerKey(2)); - DataflowAssert.thatSingletonIterable(top1).empty(); - DataflowAssert.thatSingletonIterable(top2).empty(); - DataflowAssert.thatSingletonIterable(top3).empty(); - DataflowAssert.that(largestPerKey).empty(); - DataflowAssert.that(smallestPerKey).empty(); + PAssert.thatSingletonIterable(top1).empty(); + PAssert.thatSingletonIterable(top2).empty(); + PAssert.thatSingletonIterable(top3).empty(); + PAssert.that(largestPerKey).empty(); + PAssert.that(smallestPerKey).empty(); p.run(); } @@ -180,13 +180,13 @@ public class TopTest { PCollection<KV<String, List<Integer>>> smallestPerKey = inputTable .apply(Top.<String, Integer>smallestPerKey(0)); - DataflowAssert.thatSingletonIterable(top1).empty(); - DataflowAssert.thatSingletonIterable(top2).empty(); - DataflowAssert.thatSingletonIterable(top3).empty(); - DataflowAssert.that(largestPerKey).containsInAnyOrder( + PAssert.thatSingletonIterable(top1).empty(); + PAssert.thatSingletonIterable(top2).empty(); + PAssert.thatSingletonIterable(top3).empty(); + PAssert.that(largestPerKey).containsInAnyOrder( KV.of("a", Arrays.<Integer>asList()), KV.of("b", Arrays.<Integer>asList())); - DataflowAssert.that(smallestPerKey).containsInAnyOrder( + PAssert.that(smallestPerKey).containsInAnyOrder( KV.of("a", Arrays.<Integer>asList()), KV.of("b", Arrays.<Integer>asList())); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java index 790a175..69656d6 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java @@ -23,7 +23,7 @@ import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.BigEndianIntegerCoder; import com.google.cloud.dataflow.sdk.coders.KvCoder; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; @@ -65,7 +65,7 @@ public class ValuesTest { PCollection<Integer> output = input.apply(Values.<Integer>create()); - DataflowAssert.that(output) + PAssert.that(output) .containsInAnyOrder(1, 2, 3, 4, 4); p.run(); @@ -82,7 +82,7 @@ public class ValuesTest { PCollection<Integer> output = input.apply(Values.<Integer>create()); - DataflowAssert.that(output).empty(); + PAssert.that(output).empty(); p.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java index 69a4d2e..59919e4 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java @@ -36,7 +36,7 @@ import com.google.cloud.dataflow.sdk.coders.VoidCoder; import com.google.cloud.dataflow.sdk.options.DirectPipelineOptions; import com.google.cloud.dataflow.sdk.options.PipelineOptionsFactory; import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.windowing.FixedWindows; @@ -106,7 +106,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(47, 47, 47); + PAssert.that(output).containsInAnyOrder(47, 47, 47); pipeline.run(); } @@ -136,7 +136,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(47, 47, 48); + PAssert.that(output).containsInAnyOrder(47, 47, 48); pipeline.run(); } @@ -211,7 +211,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 11, 13, 17, 23); + PAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 11, 13, 17, 23); pipeline.run(); } @@ -250,7 +250,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 31, 33, 37, 43); + PAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 31, 33, 37, 43); pipeline.run(); } @@ -276,7 +276,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(results).containsInAnyOrder(1); + PAssert.that(results).containsInAnyOrder(1); pipeline.run(); } @@ -321,7 +321,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(output).containsInAnyOrder(11); + PAssert.that(output).containsInAnyOrder(11); pipeline.run(); } @@ -346,7 +346,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 11, 13, 17, 23); + PAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 11, 13, 17, 23); pipeline.run(); } @@ -383,7 +383,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 31, 33, 37, 43); + PAssert.that(output).containsInAnyOrder(11, 13, 17, 23, 31, 33, 37, 43); pipeline.run(); } @@ -408,7 +408,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(results).containsInAnyOrder(1); + PAssert.that(results).containsInAnyOrder(1); pipeline.run(); } @@ -439,7 +439,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(output).containsInAnyOrder(11); + PAssert.that(output).containsInAnyOrder(11); pipeline.run(); } @@ -466,7 +466,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("apple", 2), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -498,7 +498,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("a", 1), KV.of("a", 2), KV.of("b", 3)); pipeline.run(); @@ -548,7 +548,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("apple", 2), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -587,7 +587,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("apple", 2), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -630,7 +630,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("a", 1), KV.of("a", 2), KV.of("b", 3)); pipeline.run(); @@ -670,7 +670,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("apple", 2), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -699,7 +699,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(results).containsInAnyOrder(1); + PAssert.that(results).containsInAnyOrder(1); pipeline.run(); } @@ -728,7 +728,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(results).containsInAnyOrder(1); + PAssert.that(results).containsInAnyOrder(1); pipeline.run(); } @@ -776,7 +776,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(output).containsInAnyOrder(KV.of("apple", 1)); + PAssert.that(output).containsInAnyOrder(KV.of("apple", 1)); pipeline.run(); } @@ -802,7 +802,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -832,7 +832,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("a", 1), KV.of("b", 3)); pipeline.run(); @@ -861,7 +861,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -899,7 +899,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("banana", 2), KV.of("blackberry", 3)); pipeline.run(); @@ -940,7 +940,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("a", 1), KV.of("b", 2), KV.of("b", 3)); pipeline.run(); @@ -981,7 +981,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("banana", 2), KV.of("blackberry", 3)); pipeline.run(); @@ -1010,7 +1010,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(results).containsInAnyOrder(1); + PAssert.that(results).containsInAnyOrder(1); pipeline.run(); } @@ -1038,7 +1038,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(results).containsInAnyOrder(1); + PAssert.that(results).containsInAnyOrder(1); pipeline.run(); } @@ -1068,7 +1068,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 1), KV.of("banana", 3), KV.of("blackberry", 3)); // PipelineExecutionException is thrown with cause having a message stating that a @@ -1120,7 +1120,7 @@ public class ViewTest implements Serializable { })); // Pass at least one value through to guarantee that DoFn executes. - DataflowAssert.that(output).containsInAnyOrder(KV.of("apple", 1)); + PAssert.that(output).containsInAnyOrder(KV.of("apple", 1)); pipeline.run(); } @@ -1144,7 +1144,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("apple", 21), KV.of("banana", 3), KV.of("blackberry", 3)); pipeline.run(); @@ -1178,7 +1178,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder("A1", "B5", "C1"); + PAssert.that(output).containsInAnyOrder("A1", "B5", "C1"); p.run(); } @@ -1211,7 +1211,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder("A6", "B6", "C6"); + PAssert.that(output).containsInAnyOrder("A6", "B6", "C6"); p.run(); } @@ -1242,7 +1242,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder("A0", "B5", "C0"); + PAssert.that(output).containsInAnyOrder("A0", "B5", "C0"); p.run(); } @@ -1272,7 +1272,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder("null"); + PAssert.that(output).containsInAnyOrder("null"); p.run(); } @@ -1317,7 +1317,7 @@ public class ViewTest implements Serializable { } })); - DataflowAssert.that(output).containsInAnyOrder(17); + PAssert.that(output).containsInAnyOrder(17); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java index 9216961..ca01a72 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; import com.google.cloud.dataflow.sdk.values.PCollection; @@ -73,7 +73,7 @@ public class WithKeysTest { PCollection<KV<Integer, String>> output = input.apply(WithKeys.of( new LengthAsKey())); - DataflowAssert.that(output) + PAssert.that(output) .containsInAnyOrder(WITH_KEYS); p.run(); @@ -89,7 +89,7 @@ public class WithKeysTest { PCollection<KV<Integer, String>> output = input.apply(WithKeys.<Integer, String>of(100)); - DataflowAssert.that(output) + PAssert.that(output) .containsInAnyOrder(WITH_CONST_KEYS); p.run(); @@ -110,7 +110,7 @@ public class WithKeysTest { PCollection<KV<Integer, String>> output = input.apply(WithKeys.of(new LengthAsKey()).withKeyType(TypeDescriptor.of(Integer.class))); - DataflowAssert.that(output).containsInAnyOrder(WITH_KEYS); + PAssert.that(output).containsInAnyOrder(WITH_KEYS); p.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java index 54639af..6ccc85e 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java @@ -20,7 +20,7 @@ package com.google.cloud.dataflow.sdk.transforms; import static org.hamcrest.Matchers.isA; import com.google.cloud.dataflow.sdk.Pipeline.PipelineExecutionException; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; @@ -72,9 +72,9 @@ public class WithTimestampsTest implements Serializable { } })); - DataflowAssert.that(timestamped) + PAssert.that(timestamped) .containsInAnyOrder(yearTwoThousand, "0", "1234", Integer.toString(Integer.MAX_VALUE)); - DataflowAssert.that(timestampedVals) + PAssert.that(timestampedVals) .containsInAnyOrder( KV.of("0", new Instant(0)), KV.of("1234", new Instant(1234L)), @@ -156,9 +156,9 @@ public class WithTimestampsTest implements Serializable { } })); - DataflowAssert.that(timestampedWithSkew) + PAssert.that(timestampedWithSkew) .containsInAnyOrder(yearTwoThousand, "0", "1234", Integer.toString(Integer.MAX_VALUE)); - DataflowAssert.that(timestampedVals) + PAssert.that(timestampedVals) .containsInAnyOrder( KV.of("0", new Instant(0L).minus(skew)), KV.of("1234", new Instant(1234L).minus(skew)), http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java index 251612e..e9bf3a6 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java @@ -25,7 +25,7 @@ import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.BigEndianIntegerCoder; import com.google.cloud.dataflow.sdk.coders.KvCoder; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Create; @@ -129,7 +129,7 @@ public class CoGroupByKeyTest implements Serializable { PCollection<KV<Integer, CoGbkResult>> coGbkResults = buildGetOnlyGbk(p, tag1, tag2); - DataflowAssert.thatMap(coGbkResults).satisfies( + PAssert.thatMap(coGbkResults).satisfies( new SerializableFunction<Map<Integer, CoGbkResult>, Void>() { @Override public Void apply(Map<Integer, CoGbkResult> results) { @@ -266,7 +266,7 @@ public class CoGroupByKeyTest implements Serializable { PCollection<KV<Integer, CoGbkResult>> coGbkResults = buildPurchasesCoGbk(p, purchasesTag, addressesTag, namesTag); - DataflowAssert.thatMap(coGbkResults).satisfies( + PAssert.thatMap(coGbkResults).satisfies( new SerializableFunction<Map<Integer, CoGbkResult>, Void>() { @Override public Void apply(Map<Integer, CoGbkResult> results) { @@ -466,7 +466,7 @@ public class CoGroupByKeyTest implements Serializable { new CorrelatePurchaseCountForAddressesWithoutNamesFn( purchasesTag, addressesTag, namesTag))); - DataflowAssert.that(purchaseCountByKnownAddressesWithoutKnownNames) + PAssert.that(purchaseCountByKnownAddressesWithoutKnownNames) .containsInAnyOrder( KV.of("29 School Rd", 2), KV.of("383 Jackson Street", 1)); @@ -491,7 +491,7 @@ public class CoGroupByKeyTest implements Serializable { PCollection<KV<String, String>> clickOfPurchase = coGbkResults.apply(ParDo.of( new ClickOfPurchaseFn(clicksTag, purchasesTag))); - DataflowAssert.that(clickOfPurchase) + PAssert.that(clickOfPurchase) .containsInAnyOrder( KV.of("Click t0:Boat t1", "0:3"), KV.of("Click t0:Shoesi t2", "0:3"), http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java index a5fb14c..1df0d96 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java @@ -20,7 +20,7 @@ package com.google.cloud.dataflow.sdk.transforms.windowing; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; import com.google.cloud.dataflow.sdk.io.TextIO; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Count; @@ -103,7 +103,7 @@ public class WindowingTest implements Serializable { input .apply(new WindowedCount(FixedWindows.of(new Duration(10)))); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( output("a", 1, 1, 0, 10), output("b", 2, 2, 0, 10), output("c", 1, 11, 10, 20), @@ -128,7 +128,7 @@ public class WindowingTest implements Serializable { .apply(new WindowedCount( SlidingWindows.of(new Duration(10)).every(new Duration(5)))); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( output("a", 1, 1, -5, 5), output("a", 2, 5, 0, 10), output("a", 1, 10, 5, 15), @@ -153,7 +153,7 @@ public class WindowingTest implements Serializable { input .apply(new WindowedCount(Sessions.withGapDuration(new Duration(10)))); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( output("a", 2, 1, 1, 15), output("a", 1, 20, 20, 30)); @@ -181,7 +181,7 @@ public class WindowingTest implements Serializable { .apply(Flatten.<String>pCollections()) .apply(new WindowedCount(FixedWindows.of(new Duration(5)))); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( output("a", 2, 1, 0, 5), output("b", 2, 2, 0, 5)); @@ -199,7 +199,7 @@ public class WindowingTest implements Serializable { input .apply(new WindowedCount(FixedWindows.of(new Duration(10)))); - DataflowAssert.that(output).empty(); + PAssert.that(output).empty(); p.run(); } @@ -223,7 +223,7 @@ public class WindowingTest implements Serializable { .apply(ParDo.of(new ExtractWordsWithTimestampsFn())) .apply(new WindowedCount(FixedWindows.of(Duration.millis(10)))); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( output("a", 1, 1, 0, 10), output("b", 2, 2, 0, 10), output("c", 1, 11, 10, 20), http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java index dccef4f..7fafe0c 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java @@ -23,7 +23,7 @@ import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.KvCoder; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; import com.google.cloud.dataflow.sdk.coders.VarIntCoder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Create; @@ -79,7 +79,7 @@ public class ReshuffleTest { PCollection<KV<String, Integer>> output = input .apply(Reshuffle.<String, Integer>of()); - DataflowAssert.that(output).containsInAnyOrder(ARBITRARY_KVS); + PAssert.that(output).containsInAnyOrder(ARBITRARY_KVS); assertEquals( input.getWindowingStrategy(), @@ -103,7 +103,7 @@ public class ReshuffleTest { PCollection<KV<String, Iterable<Integer>>> output = input .apply(Reshuffle.<String, Iterable<Integer>>of()); - DataflowAssert.that(output).containsInAnyOrder(GROUPED_TESTABLE_KVS); + PAssert.that(output).containsInAnyOrder(GROUPED_TESTABLE_KVS); assertEquals( input.getWindowingStrategy(), @@ -127,7 +127,7 @@ public class ReshuffleTest { PCollection<KV<String, Iterable<Integer>>> output = input .apply(Reshuffle.<String, Iterable<Integer>>of()); - DataflowAssert.that(output).containsInAnyOrder(GROUPED_TESTABLE_KVS); + PAssert.that(output).containsInAnyOrder(GROUPED_TESTABLE_KVS); assertEquals( input.getWindowingStrategy(), @@ -151,7 +151,7 @@ public class ReshuffleTest { PCollection<KV<String, Iterable<Integer>>> output = input .apply(Reshuffle.<String, Iterable<Integer>>of()); - DataflowAssert.that(output).containsInAnyOrder(GROUPED_TESTABLE_KVS); + PAssert.that(output).containsInAnyOrder(GROUPED_TESTABLE_KVS); assertEquals( input.getWindowingStrategy(), @@ -174,7 +174,7 @@ public class ReshuffleTest { PCollection<KV<String, Integer>> output = input .apply(Reshuffle.<String, Integer>of()); - DataflowAssert.that(output).containsInAnyOrder(ARBITRARY_KVS); + PAssert.that(output).containsInAnyOrder(ARBITRARY_KVS); assertEquals( input.getWindowingStrategy(), @@ -198,7 +198,7 @@ public class ReshuffleTest { PCollection<KV<String, Integer>> output = input .apply(Reshuffle.<String, Integer>of()); - DataflowAssert.that(output).containsInAnyOrder(ARBITRARY_KVS); + PAssert.that(output).containsInAnyOrder(ARBITRARY_KVS); assertEquals( input.getWindowingStrategy(), http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java index 9da1645..17d86b9 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Create; @@ -84,9 +84,9 @@ public final class PCollectionTupleTest implements Serializable { assertNotNull("outputs.getPipeline()", outputs.getPipeline()); outputs = outputs.and(mainOutputTag, mainInput); - DataflowAssert.that(outputs.get(mainOutputTag)).containsInAnyOrder(inputs); - DataflowAssert.that(outputs.get(sideOutputTag)).containsInAnyOrder(inputs); - DataflowAssert.that(outputs.get(emptyOutputTag)).empty(); + PAssert.that(outputs.get(mainOutputTag)).containsInAnyOrder(inputs); + PAssert.that(outputs.get(sideOutputTag)).containsInAnyOrder(inputs); + PAssert.that(outputs.get(emptyOutputTag)).empty(); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java index f04bb94..03709d9 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java @@ -18,7 +18,7 @@ package com.google.cloud.dataflow.sdk.transforms; import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; import com.google.cloud.dataflow.sdk.values.PCollection; @@ -71,7 +71,7 @@ public class CombineJava8Test implements Serializable { return sum; })); - DataflowAssert.that(output).containsInAnyOrder(10); + PAssert.that(output).containsInAnyOrder(10); pipeline.run(); } @@ -86,7 +86,7 @@ public class CombineJava8Test implements Serializable { .apply(Create.of(1, 2, 3, 4)) .apply(Combine.globally(new Summer()::sum)); - DataflowAssert.that(output).containsInAnyOrder(10); + PAssert.that(output).containsInAnyOrder(10); pipeline.run(); } @@ -107,7 +107,7 @@ public class CombineJava8Test implements Serializable { return sum; })); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("a", 4), KV.of("b", 2), KV.of("c", 4)); @@ -125,7 +125,7 @@ public class CombineJava8Test implements Serializable { .apply(Create.of(KV.of("a", 1), KV.of("b", 2), KV.of("a", 3), KV.of("c", 4))) .apply(Combine.perKey(new Summer()::sum)); - DataflowAssert.that(output).containsInAnyOrder( + PAssert.that(output).containsInAnyOrder( KV.of("a", 4), KV.of("b", 2), KV.of("c", 4)); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java index a38b434..7169468 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java @@ -19,7 +19,7 @@ package com.google.cloud.dataflow.sdk.transforms; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.PCollection; @@ -52,7 +52,7 @@ public class FilterJava8Test implements Serializable { .apply(Create.of(591, 11789, 1257, 24578, 24799, 307)) .apply(Filter.byPredicate(i -> true)); - DataflowAssert.that(output).containsInAnyOrder(591, 11789, 1257, 24578, 24799, 307); + PAssert.that(output).containsInAnyOrder(591, 11789, 1257, 24578, 24799, 307); pipeline.run(); } @@ -64,7 +64,7 @@ public class FilterJava8Test implements Serializable { .apply(Create.of(1, 2, 4, 5)) .apply(Filter.byPredicate(i -> false)); - DataflowAssert.that(output).empty(); + PAssert.that(output).empty(); pipeline.run(); } @@ -77,7 +77,7 @@ public class FilterJava8Test implements Serializable { .apply(Create.of(1, 2, 3, 4, 5, 6, 7)) .apply(Filter.byPredicate(i -> i % 2 == 0)); - DataflowAssert.that(output).containsInAnyOrder(2, 4, 6); + PAssert.that(output).containsInAnyOrder(2, 4, 6); pipeline.run(); } @@ -107,7 +107,7 @@ public class FilterJava8Test implements Serializable { .apply(Create.of(1, 2, 3, 4, 5, 6, 7)) .apply(Filter.byPredicate(new EvenFilter()::isEven)); - DataflowAssert.that(output).containsInAnyOrder(2, 4, 6); + PAssert.that(output).containsInAnyOrder(2, 4, 6); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java index fdf62f0..0fa8059 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java @@ -18,7 +18,7 @@ package com.google.cloud.dataflow.sdk.transforms; import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.PCollection; import com.google.cloud.dataflow.sdk.values.TypeDescriptor; @@ -56,7 +56,7 @@ public class FlatMapElementsJava8Test implements Serializable { .via((Integer i) -> ImmutableList.of(i, -i)) .withOutputType(new TypeDescriptor<Integer>() {})); - DataflowAssert.that(output).containsInAnyOrder(1, 3, -1, -3, 2, -2); + PAssert.that(output).containsInAnyOrder(1, 3, -1, -3, 2, -2); pipeline.run(); } @@ -73,7 +73,7 @@ public class FlatMapElementsJava8Test implements Serializable { .via(new Negater()::numAndNegation) .withOutputType(new TypeDescriptor<Integer>() {})); - DataflowAssert.that(output).containsInAnyOrder(1, 3, -1, -3, 2, -2); + PAssert.that(output).containsInAnyOrder(1, 3, -1, -3, 2, -2); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java index 41b695e..4f0f232 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java @@ -18,7 +18,7 @@ package com.google.cloud.dataflow.sdk.transforms; import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.PCollection; import com.google.cloud.dataflow.sdk.values.TypeDescriptor; @@ -49,7 +49,7 @@ public class MapElementsJava8Test implements Serializable { .via((Integer i) -> i * 2) .withOutputType(new TypeDescriptor<Integer>() {})); - DataflowAssert.that(output).containsInAnyOrder(6, 2, 4); + PAssert.that(output).containsInAnyOrder(6, 2, 4); pipeline.run(); } @@ -66,7 +66,7 @@ public class MapElementsJava8Test implements Serializable { .via(new Doubler()::doubleIt) .withOutputType(new TypeDescriptor<Integer>() {})); - DataflowAssert.that(output).containsInAnyOrder(6, 2, 4); + PAssert.that(output).containsInAnyOrder(6, 2, 4); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java index 82bd29c..938ea7f 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.PCollectionList; @@ -51,9 +51,9 @@ public class PartitionJava8Test implements Serializable { .apply(Create.of(1, 2, 4, 5)) .apply(Partition.of(3, (element, numPartitions) -> element % numPartitions)); assertEquals(3, outputs.size()); - DataflowAssert.that(outputs.get(0)).empty(); - DataflowAssert.that(outputs.get(1)).containsInAnyOrder(1, 4); - DataflowAssert.that(outputs.get(2)).containsInAnyOrder(2, 5); + PAssert.that(outputs.get(0)).empty(); + PAssert.that(outputs.get(1)).containsInAnyOrder(1, 4); + PAssert.that(outputs.get(2)).containsInAnyOrder(2, 5); pipeline.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java index d187abf..d987395 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java @@ -22,7 +22,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.PCollection; import com.google.cloud.dataflow.sdk.values.TypeDescriptor; @@ -62,7 +62,7 @@ public class RemoveDuplicatesJava8Test { dupes.apply(RemoveDuplicates.withRepresentativeValueFn((String s) -> s.length()) .withRepresentativeType(TypeDescriptor.of(Integer.class))); - DataflowAssert.that(deduped).satisfies((Iterable<String> strs) -> { + PAssert.that(deduped).satisfies((Iterable<String> strs) -> { Set<Integer> seenLengths = new HashSet<>(); for (String s : strs) { assertThat(predupedContents.values(), hasItem(s)); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java index 9e22a91..a337935 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java @@ -18,7 +18,7 @@ package com.google.cloud.dataflow.sdk.transforms; import com.google.cloud.dataflow.sdk.Pipeline.PipelineExecutionException; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; @@ -51,7 +51,7 @@ public class WithKeysJava8Test { WithKeys.of((String s) -> Integer.valueOf(s)) .withKeyType(TypeDescriptor.of(Integer.class))); - DataflowAssert.that(kvs).containsInAnyOrder( + PAssert.that(kvs).containsInAnyOrder( KV.of(1234, "1234"), KV.of(0, "0"), KV.of(-12, "-12"), KV.of(3210, "3210")); p.run(); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java index 7cfa215..1a8a813 100644 --- a/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java +++ b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java @@ -17,7 +17,7 @@ */ package com.google.cloud.dataflow.sdk.transforms; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.values.KV; @@ -55,9 +55,9 @@ public class WithTimestampsJava8Test implements Serializable { } })); - DataflowAssert.that(timestamped) + PAssert.that(timestamped) .containsInAnyOrder(yearTwoThousand, "0", "1234", Integer.toString(Integer.MAX_VALUE)); - DataflowAssert.that(timestampedVals) + PAssert.that(timestampedVals) .containsInAnyOrder( KV.of("0", new Instant(0)), KV.of("1234", new Instant("1234")), http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index 5a03522..6acac43 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -188,7 +188,7 @@ <scope>runtime</scope> </dependency> - <!-- Hamcrest and JUnit are required dependencies of DataflowAssert, + <!-- Hamcrest and JUnit are required dependencies of PAssert, which is used in the main code of DebuggingWordCount example. --> <dependency> <groupId>org.hamcrest</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java index 32fca4e..bd63b75 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java @@ -23,7 +23,7 @@ import com.google.cloud.dataflow.sdk.io.TextIO; import com.google.cloud.dataflow.sdk.options.Default; import com.google.cloud.dataflow.sdk.options.Description; import com.google.cloud.dataflow.sdk.options.PipelineOptionsFactory; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.transforms.Aggregator; import com.google.cloud.dataflow.sdk.transforms.DoFn; import com.google.cloud.dataflow.sdk.transforms.ParDo; @@ -56,7 +56,7 @@ import java.util.regex.Pattern; * 1. Logging to Cloud Logging * 2. Controlling Dataflow worker log levels * 3. Creating a custom aggregator - * 4. Testing your Pipeline via DataflowAssert + * 4. Testing your Pipeline via PAssert * </pre> * * <p>To execute this pipeline locally, specify general pipeline configuration: @@ -179,13 +179,13 @@ public class DebuggingWordCount { .apply(ParDo.of(new FilterTextFn(options.getFilterPattern()))); /** - * Concept #4: DataflowAssert is a set of convenient PTransforms in the style of + * Concept #4: PAssert is a set of convenient PTransforms in the style of * Hamcrest's collection matchers that can be used when writing Pipeline level tests - * to validate the contents of PCollections. DataflowAssert is best used in unit tests + * to validate the contents of PCollections. PAssert is best used in unit tests * with small data sets but is demonstrated here as a teaching tool. * * <p>Below we verify that the set of filtered words matches our expected counts. Note - * that DataflowAssert does not provide any output and that successful completion of the + * that PAssert does not provide any output and that successful completion of the * Pipeline implies that the expectations were met. Learn more at * https://cloud.google.com/dataflow/pipelines/testing-your-pipeline on how to test * your Pipeline and see {@link DebuggingWordCountTest} for an example unit test. @@ -193,7 +193,7 @@ public class DebuggingWordCount { List<KV<String, Long>> expectedResults = Arrays.asList( KV.of("Flourish", 3L), KV.of("stomach", 1L)); - DataflowAssert.that(filteredWords).containsInAnyOrder(expectedResults); + PAssert.that(filteredWords).containsInAnyOrder(expectedResults); p.run(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d73ceab8/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java index a28073f..b3319b6 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java @@ -22,7 +22,7 @@ import ${package}.WordCount.ExtractWordsFn; import ${package}.WordCount.FormatAsTextFn; import com.google.cloud.dataflow.sdk.Pipeline; import com.google.cloud.dataflow.sdk.coders.StringUtf8Coder; -import com.google.cloud.dataflow.sdk.testing.DataflowAssert; +import com.google.cloud.dataflow.sdk.testing.PAssert; import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Create; @@ -80,7 +80,7 @@ public class WordCountTest { PCollection<String> output = input.apply(new CountWords()) .apply(ParDo.of(new FormatAsTextFn())); - DataflowAssert.that(output).containsInAnyOrder(COUNTS_ARRAY); + PAssert.that(output).containsInAnyOrder(COUNTS_ARRAY); p.run(); } }
