Merge pull request apache#8506: [BEAM-7229] ParDoLifecycleTest: remov…

…e duplicated test methods
mransley · May 6, 2019 · a7c40dd · a7c40dd
2 parents 05e78f8 + 5108958
commit a7c40dd
Showing 1 changed file with 4 additions and 52 deletions.
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java
@@ -154,55 +154,7 @@ private static class CallSequenceEnforcingStatefulFn<K, V>
 
  @Test
  @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testTeardownCalledAfterExceptionInStartBundle() {
- ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.START_BUNDLE);
- p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
- try {
- p.run();
- fail("Pipeline should have failed with an exception");
- } catch (Exception e) {
- assertThat(
- "Function should have been torn down after exception",
- ExceptionThrowingFn.teardownCalled.get(),
- is(true));
- }
- }
-
- @Test
- @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testTeardownCalledAfterExceptionInProcessElement() {
- ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.PROCESS_ELEMENT);
- p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
- try {
- p.run();
- fail("Pipeline should have failed with an exception");
- } catch (Exception e) {
- assertThat(
- "Function should have been torn down after exception",
- ExceptionThrowingFn.teardownCalled.get(),
- is(true));
- }
- }
-
- @Test
- @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testTeardownCalledAfterExceptionInFinishBundle() {
- ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.FINISH_BUNDLE);
- p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
- try {
- p.run();
- fail("Pipeline should have failed with an exception");
- } catch (Exception e) {
- assertThat(
- "Function should have been torn down after exception",
- ExceptionThrowingFn.teardownCalled.get(),
- is(true));
- }
- }
-
- @Test
- @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testWithContextTeardownCalledAfterExceptionInSetup() {
+ public void testTeardownCalledAfterExceptionInSetup() {
  ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.SETUP);
  p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
  try {
@@ -218,7 +170,7 @@ public void testWithContextTeardownCalledAfterExceptionInSetup() {
 
  @Test
  @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testWithContextTeardownCalledAfterExceptionInStartBundle() {
+ public void testTeardownCalledAfterExceptionInStartBundle() {
  ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.START_BUNDLE);
  p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
  try {
@@ -234,7 +186,7 @@ public void testWithContextTeardownCalledAfterExceptionInStartBundle() {
 
  @Test
  @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testWithContextTeardownCalledAfterExceptionInProcessElement() {
+ public void testTeardownCalledAfterExceptionInProcessElement() {
  ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.PROCESS_ELEMENT);
  p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
  try {
@@ -250,7 +202,7 @@ public void testWithContextTeardownCalledAfterExceptionInProcessElement() {
 
  @Test
  @Category({ValidatesRunner.class, UsesParDoLifecycle.class})
- public void testWithContextTeardownCalledAfterExceptionInFinishBundle() {
+ public void testTeardownCalledAfterExceptionInFinishBundle() {
  ExceptionThrowingFn fn = new ExceptionThrowingFn(MethodForException.FINISH_BUNDLE);
  p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
  try {