azkaban-developers

Test cleanup: rename checkEventExists -> assertEvents (#1153)

6/5/2017 12:22:02 PM

Juho Autio

Commit: ce9e4a2

Tree: cbb9fdf

Parents: 6d3b081

Changes

azkaban-exec-server/src/test/java/azkaban/execapp/EventCollectorListener.java 2(+1 -1)

azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java 12(+6 -6)

azkaban-exec-server/src/test/java/azkaban/execapp/JobRunnerTest.java 14(+7 -7)

Details

azkaban-exec-server/src/test/java/azkaban/execapp/EventCollectorListener.java 2(+1 -1)

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/EventCollectorListener.java b/azkaban-exec-server/src/test/java/azkaban/execapp/EventCollectorListener.java
index 72eefa9..e2d9356 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/EventCollectorListener.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/EventCollectorListener.java
@@ -63,7 +63,7 @@ public class EventCollectorListener implements EventListener {
     return true;
   }
 
-  public void checkEventExists(final Type... expected) {
+  public void assertEvents(final Type... expected) {
     Object[] captured = this.eventList.stream()
         .filter(event -> event.getRunner() != null)
         .map(event -> event.getType())

azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java 12(+6 -6)

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
index f38e8b1..9265a39 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
@@ -117,7 +117,7 @@ public class FlowRunnerTest extends FlowRunnerTestBase {
     assertStatus("job8", Status.SUCCEEDED);
     assertStatus("job10", Status.SUCCEEDED);
 
-    eventCollector.checkEventExists(Type.FLOW_STARTED, Type.FLOW_FINISHED);
+    eventCollector.assertEvents(Type.FLOW_STARTED, Type.FLOW_FINISHED);
   }
 
   @Test
@@ -156,7 +156,7 @@ public class FlowRunnerTest extends FlowRunnerTestBase {
     assertStatus("job8", Status.SUCCEEDED);
     assertStatus("job10", Status.SKIPPED);
 
-    eventCollector.checkEventExists(Type.FLOW_STARTED, Type.FLOW_FINISHED);
+    eventCollector.assertEvents(Type.FLOW_STARTED, Type.FLOW_FINISHED);
   }
 
   @Test
@@ -186,7 +186,7 @@ public class FlowRunnerTest extends FlowRunnerTestBase {
     assertStatus("job10", Status.CANCELLED);
     assertThreadShutDown();
 
-    eventCollector.checkEventExists(Type.FLOW_STARTED, Type.FLOW_FINISHED);
+    eventCollector.assertEvents(Type.FLOW_STARTED, Type.FLOW_FINISHED);
   }
 
   @Test
@@ -217,7 +217,7 @@ public class FlowRunnerTest extends FlowRunnerTestBase {
     assertStatus("job9", Status.CANCELLED);
     assertStatus("job10", Status.CANCELLED);
 
-    eventCollector.checkEventExists(Type.FLOW_STARTED, Type.FLOW_FINISHED);
+    eventCollector.assertEvents(Type.FLOW_STARTED, Type.FLOW_FINISHED);
   }
 
   @Test
@@ -247,7 +247,7 @@ public class FlowRunnerTest extends FlowRunnerTestBase {
     assertStatus("job10", Status.CANCELLED);
     assertThreadShutDown();
 
-    eventCollector.checkEventExists(Type.FLOW_STARTED, Type.FLOW_FINISHED);
+    eventCollector.assertEvents(Type.FLOW_STARTED, Type.FLOW_FINISHED);
   }
 
   @Test
@@ -277,7 +277,7 @@ public class FlowRunnerTest extends FlowRunnerTestBase {
 
     assertFlowStatus(Status.KILLED);
 
-    eventCollector.checkEventExists(Type.FLOW_STARTED, Type.FLOW_FINISHED);
+    eventCollector.assertEvents(Type.FLOW_STARTED, Type.FLOW_FINISHED);
   }
 
   @Test

azkaban-exec-server/src/test/java/azkaban/execapp/JobRunnerTest.java 14(+7 -7)

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/JobRunnerTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/JobRunnerTest.java
index eb2ed5c..a513c8e 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/JobRunnerTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/JobRunnerTest.java
@@ -102,7 +102,7 @@ public class JobRunnerTest {
 
     Assert.assertTrue(loader.getNodeUpdateCount(node.getId()) == 3);
 
-    eventCollector.checkEventExists(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
   }
 
   @Ignore
@@ -131,7 +131,7 @@ public class JobRunnerTest {
     Assert.assertTrue(!runner.isKilled());
     Assert.assertTrue(loader.getNodeUpdateCount(node.getId()) == 3);
 
-    eventCollector.checkEventExists(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
   }
 
   @Test
@@ -162,7 +162,7 @@ public class JobRunnerTest {
 
     Assert.assertTrue(loader.getNodeUpdateCount(node.getId()) == null);
 
-    eventCollector.checkEventExists(Type.JOB_STARTED, Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_STARTED, Type.JOB_FINISHED);
   }
 
   @Test
@@ -193,7 +193,7 @@ public class JobRunnerTest {
     Assert.assertTrue(outputProps == null);
     Assert.assertTrue(runner.getLogFilePath() == null);
     Assert.assertTrue(!runner.isKilled());
-    eventCollector.checkEventExists(Type.JOB_STARTED, Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_STARTED, Type.JOB_FINISHED);
   }
 
   @Ignore
@@ -232,7 +232,7 @@ public class JobRunnerTest {
     Assert.assertTrue(logFile.exists());
     Assert.assertTrue(eventCollector.checkOrdering());
     Assert.assertTrue(runner.isKilled());
-    eventCollector.checkEventExists(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
   }
 
   @Ignore
@@ -267,7 +267,7 @@ public class JobRunnerTest {
     Assert.assertTrue(loader.getNodeUpdateCount(node.getId()) == 3);
 
     Assert.assertTrue(eventCollector.checkOrdering());
-    eventCollector.checkEventExists(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_STARTED, Type.JOB_STATUS_CHANGED, Type.JOB_FINISHED);
   }
 
   @Test
@@ -307,7 +307,7 @@ public class JobRunnerTest {
     Assert.assertTrue(logFile.exists());
 
     Assert.assertEquals(2L, (long) loader.getNodeUpdateCount("testJob"));
-    eventCollector.checkEventExists(Type.JOB_FINISHED);
+    eventCollector.assertEvents(Type.JOB_FINISHED);
   }
 
   private Props createProps(final int sleepSec, final boolean fail) {