From 2f331d626f7f6a29c0646693c6108d0a4dee407a Mon Sep 17 00:00:00 2001
From: Paul Ebermann <paul.ebermann@zalando.de>
Date: Wed, 19 Dec 2018 17:43:37 +0100
Subject: [PATCH] cleanup before and after the test

---
 .../nakadiproducer/tests/ApplicationIT.java   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/nakadi-producer-starter-spring-boot-2-test/src/test/java/org/zalando/nakadiproducer/tests/ApplicationIT.java b/nakadi-producer-starter-spring-boot-2-test/src/test/java/org/zalando/nakadiproducer/tests/ApplicationIT.java
index 4afd2270..2b29af03 100644
--- a/nakadi-producer-starter-spring-boot-2-test/src/test/java/org/zalando/nakadiproducer/tests/ApplicationIT.java
+++ b/nakadi-producer-starter-spring-boot-2-test/src/test/java/org/zalando/nakadiproducer/tests/ApplicationIT.java
@@ -1,8 +1,6 @@
 package org.zalando.nakadiproducer.tests;
 
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +8,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.zalando.nakadiproducer.transmission.MockNakadiPublishingClient;
+import org.zalando.nakadiproducer.transmission.impl.EventTransmitter;
 
 import java.io.File;
 import java.util.List;
@@ -24,15 +23,13 @@
         // by our starter *even if* it has been defined *after* the application itself. This has been a problem until
         // this commit.
         classes = { Application.class, MockNakadiConfig.class },
+        properties = { "nakadi-producer.transmission-polling-delay=30"},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
 )
 public class ApplicationIT {
     @LocalManagementPort
     private int localManagementPort;
 
-    @Autowired
-    private MockNakadiPublishingClient mockClient;
-
     @ClassRule
     public static final EnvironmentVariables environmentVariables
             = new EnvironmentVariables();
@@ -42,6 +39,19 @@ public static void fakeCredentialsDir() {
         environmentVariables.set("CREDENTIALS_DIR", new File("src/main/test/tokens").getAbsolutePath());
     }
 
+    @Autowired
+    private MockNakadiPublishingClient mockClient;
+
+    @Autowired
+    private EventTransmitter eventTransmitter;
+
+    @Before
+    @After
+    public void cleanUpMock() {
+        eventTransmitter.sendEvents();
+        mockClient.clearSentEvents();
+    }
+
     @Test
     public void shouldSuccessfullyStartAndSnapshotCanBeTriggered() throws InterruptedException {
         given().baseUri("http://localhost:" + localManagementPort).contentType("application/json")
@@ -49,7 +59,7 @@ public void shouldSuccessfullyStartAndSnapshotCanBeTriggered() throws Interrupte
         .then().statusCode(204);
 
         // leave some time for the scheduler to run
-        Thread.sleep(1200);
+        Thread.sleep(200);
 
         List<String> events = mockClient.getSentEvents("eventtype");
         assertThat(events, hasSize(2));