Remove references to OldDoFn from DoFnTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/32f84bb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/32f84bb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/32f84bb4 Branch: refs/heads/master Commit: 32f84bb4d442a9b2060a4a5fbdc77d14d6b0976b Parents: 86291de Author: Kenneth Knowles <[email protected]> Authored: Fri Aug 5 11:54:57 2016 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Mon Aug 8 11:35:17 2016 -0700 ---------------------------------------------------------------------- .../apache/beam/sdk/transforms/DoFnTest.java | 29 +------------------- 1 file changed, 1 insertion(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/32f84bb4/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java index c7e8972..710e4ce 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java @@ -22,10 +22,6 @@ import static org.hamcrest.Matchers.isA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import org.apache.beam.sdk.Pipeline.PipelineExecutionException; import org.apache.beam.sdk.testing.NeedsRunner; @@ -140,29 +136,6 @@ public class DoFnTest implements Serializable { } @Test - public void testDoFnWithContextUsingAggregators() { - NoOpOldDoFn<Object, Object> noOpFn = new NoOpOldDoFn<>(); - OldDoFn<Object, Object>.Context context = noOpFn.context(); - - OldDoFn<Object, Object> fn = spy(noOpFn); - context = spy(context); - - @SuppressWarnings("unchecked") - Aggregator<Long, Long> agg = mock(Aggregator.class); - - Sum.SumLongFn combiner = new Sum.SumLongFn(); - Aggregator<Long, Long> delegateAggregator = - fn.createAggregator("test", combiner); - - when(context.createAggregatorInternal("test", combiner)).thenReturn(agg); - - context.setupDelegateAggregators(); - delegateAggregator.addValue(1L); - - verify(agg).addValue(1L); - } - - @Test public void testDefaultPopulateDisplayDataImplementation() { DoFn<String, String> fn = new DoFn<String, String>() { }; @@ -225,7 +198,7 @@ public class DoFnTest implements Serializable { } /** - * Initialize a test pipeline with the specified {@link OldDoFn}. + * Initialize a test pipeline with the specified {@link DoFn}. */ private <InputT, OutputT> TestPipeline createTestPipeline(DoFn<InputT, OutputT> fn) { TestPipeline pipeline = TestPipeline.create();
