Fixed tests related to created event

Author: sonjaer

styx-api-service/src/test/java/com/spotify/styx/api/StatusResourceTest.java

@@ -34,6 +34,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
 import com.spotify.apollo.Environment;
 import com.spotify.apollo.Response;
 import com.spotify.apollo.Status;
@@ -132,6 +133,7 @@ public void testEventsRoundtrip() throws Exception {
     sinceVersion(Api.Version.V3);
 
     storage.writeEvent(SequenceEvent.create(Event.triggerExecution(WFI_1, TRIGGER, TriggerParameters.zero()), 0L, 0L));
+    storage.writeEvent(SequenceEvent.create(Event.dequeue(WFI_1, ImmutableSet.of()), 1L, 1L));
     storage.writeEvent(SequenceEvent.create(Event.started(WFI_1), 2L, 2L));
 
     Response<ByteString> response =

styx-api-service/src/test/java/com/spotify/styx/api/WorkflowResourceTest.java

@@ -345,7 +345,9 @@ public void shouldReturnWorkflowInstancesData() throws Exception {
     WorkflowInstance wfi = WorkflowInstance.create(WORKFLOW.id(), "2016-08-10");
     storage.writeEvent(create(Event.triggerExecution(wfi, NATURAL_TRIGGER, TRIGGER_PARAMETERS), 0L, ms("07:00:00")));
     storage.writeEvent(create(Event.dequeue(wfi, ImmutableSet.of()), 1L, ms("07:00:01")));
-    storage.writeEvent(create(Event.started(wfi), 2L, ms("07:00:02")));
+    storage.writeEvent(create(Event.submit(wfi, EXECUTION_DESCRIPTION, "exec"), 2L, ms("07:00:02")));
+    storage.writeEvent(create(Event.submitted(wfi, "exec", "test"), 3L, ms("07:00:03")));
+    storage.writeEvent(create(Event.started(wfi), 4L, ms("07:00:04")));
 
     Response<ByteString> response =
         awaitResponse(serviceHelper.request("GET", path("/foo/bar/instances")));
@@ -361,7 +363,7 @@ public void shouldReturnWorkflowInstancesData() throws Exception {
     assertJson(response, "[0].triggers.[0].complete", is(false));
     assertJson(response, "[0].triggers.[0].executions", hasSize(1));
     assertJson(response, "[0].triggers.[0].executions.[0].execution_id", is("exec"));
-    assertJson(response, "[0].triggers.[0].executions.[0].docker_image", is("img"));
+    assertJson(response, "[0].triggers.[0].executions.[0].docker_image", is("busybox:1.1"));
     assertJson(response, "[0].triggers.[0].executions.[0].statuses", hasSize(2));
     assertJson(response, "[0].triggers.[0].executions.[0].statuses.[0].status", is("SUBMITTED"));
     assertJson(response, "[0].triggers.[0].executions.[0].statuses.[1].status", is("STARTED"));
@@ -386,7 +388,9 @@ public void shouldReturnWorkflowRangeOfInstancesData() throws Exception {
     WorkflowInstance wfi = WorkflowInstance.create(WORKFLOW.id(), "2016-08-10");
     storage.writeEvent(create(Event.triggerExecution(wfi, NATURAL_TRIGGER, TRIGGER_PARAMETERS), 0L, ms("07:00:00")));
     storage.writeEvent(create(Event.dequeue(wfi, ImmutableSet.of()), 1L, ms("07:00:01")));
-    storage.writeEvent(create(Event.started(wfi), 2L, ms("07:00:02")));
+    storage.writeEvent(create(Event.submit(wfi, EXECUTION_DESCRIPTION, "exec"), 2L, ms("07:00:02")));
+    storage.writeEvent(create(Event.submitted(wfi, "exec", "test"), 3L, ms("07:00:03")));
+    storage.writeEvent(create(Event.started(wfi), 4L, ms("07:00:04")));
 
     Response<ByteString> response =
         awaitResponse(serviceHelper.request("GET", path("/foo/bar/instances?start=2016-08-10")));
@@ -402,7 +406,7 @@ public void shouldReturnWorkflowRangeOfInstancesData() throws Exception {
     assertJson(response, "[0].triggers.[0].complete", is(false));
     assertJson(response, "[0].triggers.[0].executions", hasSize(1));
     assertJson(response, "[0].triggers.[0].executions.[0].execution_id", is("exec"));
-    assertJson(response, "[0].triggers.[0].executions.[0].docker_image", is("img"));
+    assertJson(response, "[0].triggers.[0].executions.[0].docker_image", is("busybox:1.1"));
     assertJson(response, "[0].triggers.[0].executions.[0].statuses", hasSize(2));
     assertJson(response, "[0].triggers.[0].executions.[0].statuses.[0].status", is("SUBMITTED"));
     assertJson(response, "[0].triggers.[0].executions.[0].statuses.[1].status", is("STARTED"));
@@ -438,9 +442,9 @@ public void shouldReturnWorkflowInstanceData() throws Exception {
     assertJson(response, "triggers.[0].executions.[0].statuses.[0].status", is("SUBMITTED"));
     assertJson(response, "triggers.[0].executions.[0].statuses.[1].status", is("STARTED"));
     assertJson(response, "triggers.[0].executions.[0].statuses.[0].timestamp",
-               is("2016-08-10T07:00:01Z"));
+               is("2016-08-10T07:00:03Z"));
     assertJson(response, "triggers.[0].executions.[0].statuses.[1].timestamp",
-               is("2016-08-10T07:00:02Z"));
+               is("2016-08-10T07:00:04Z"));
   }
 
   @Test

styx-common/src/main/java/com/spotify/styx/testdata/TestData.java

@@ -158,6 +158,14 @@ public final class TestData {
           .commitSha(VALID_SHA)
           .build();
 
+  public static final ExecutionDescription EXECUTION_DESCRIPTION2 =
+      ExecutionDescription.builder()
+          .dockerImage("busybox:1.2")
+          .dockerArgs("foo", "bar")
+          .secret(WorkflowConfiguration.Secret.create("secret", "/dev/null"))
+          .commitSha(VALID_SHA)
+          .build();
+
   public static final Workflow WORKFLOW_WITH_RESOURCES = Workflow.create(WORKFLOW_ID.componentId(),
       HOURLY_WORKFLOW_CONFIGURATION_WITH_RESOURCES);
 

styx-scheduler-service/src/test/java/com/spotify/styx/state/handlers/TimeoutHandlerTest.java

@@ -53,7 +53,7 @@
 import org.mockito.MockitoAnnotations;
 
 @RunWith(JUnitParamsRunner.class)
-public class TimeoutHandlerTest {
+public class  TimeoutHandlerTest {
 
   private Instant now = Instant.parse("2016-12-02T22:00:00Z");
   private Time time = () -> now;

styx-service-common/src/main/java/com/spotify/styx/state/RunState.java

@@ -212,8 +212,11 @@ public RunState submitted(WorkflowInstance workflowInstance, String executionId,
     public RunState started(WorkflowInstance workflowInstance) {
       switch (state()) {
         case SUBMITTED:
-        case PREPARE:
           return state(RUNNING);
+        case PREPARE:
+          return state(RUNNING, data().builder()
+              .tries(data().tries() + 1)
+              .build());
 
         default:
           throw illegalTransition("started");