From e2a0fbaa96ac2019408dc15699a0c5b75cc39315 Mon Sep 17 00:00:00 2001 From: Waldemar Hummer Date: Tue, 25 Feb 2020 00:10:31 +0100 Subject: [PATCH 1/2] fix tests --- src/main/java/cloud/localstack/Localstack.java | 4 +++- src/test/java/cloud/localstack/SQSMessagingTest.java | 7 ++++++- .../localstack/docker/BasicDockerFunctionalityTest.java | 5 +++++ .../localstack/docker/DockerOnlySQSFunctionalityTest.java | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/cloud/localstack/Localstack.java b/src/main/java/cloud/localstack/Localstack.java index afc6f98..b24602a 100644 --- a/src/main/java/cloud/localstack/Localstack.java +++ b/src/main/java/cloud/localstack/Localstack.java @@ -191,7 +191,9 @@ public String getEndpointEC2() { return endpointForService(ServiceName.EC2); } - public String getEndpointStepFunctions() { return endpointForService(ServiceName.STEPFUNCTIONS); } + public String getEndpointStepFunctions() { + return endpointForService(ServiceName.STEPFUNCTIONS); + } public String endpointForService(String serviceName) { if (serviceToPortMap == null) { diff --git a/src/test/java/cloud/localstack/SQSMessagingTest.java b/src/test/java/cloud/localstack/SQSMessagingTest.java index fdeaf26..2c7cfe2 100644 --- a/src/test/java/cloud/localstack/SQSMessagingTest.java +++ b/src/test/java/cloud/localstack/SQSMessagingTest.java @@ -76,6 +76,11 @@ public void testSendMessage() throws JMSException { MessageConsumer consumer = session.createConsumer(queue); TextMessage received = (TextMessage) consumer.receive(); Assert.assertNotNull(received); + + // clean up + consumer.close(); + producer.close(); + connection.close(); } @Test @@ -169,4 +174,4 @@ public void testSendMultiByteCharactersMessage() throws JMSException { final ReceiveMessageResult messageResult = clientSQS.receiveMessage(queueUrl); Assert.assertNotNull(messageResult); } -} \ No newline at end of file +} diff --git a/src/test/java/cloud/localstack/docker/BasicDockerFunctionalityTest.java b/src/test/java/cloud/localstack/docker/BasicDockerFunctionalityTest.java index 9d32d80..3a37f2d 100644 --- a/src/test/java/cloud/localstack/docker/BasicDockerFunctionalityTest.java +++ b/src/test/java/cloud/localstack/docker/BasicDockerFunctionalityTest.java @@ -172,6 +172,11 @@ public void testSQS() throws Exception { MessageConsumer consumer = session.createConsumer(queue); TextMessage received = (TextMessage) consumer.receive(); Assertions.assertThat(received.getText()).isEqualTo("Hello World!"); + + // clean up + consumer.close(); + producer.close(); + connection.close(); } @org.junit.Test diff --git a/src/test/java/cloud/localstack/docker/DockerOnlySQSFunctionalityTest.java b/src/test/java/cloud/localstack/docker/DockerOnlySQSFunctionalityTest.java index 44fb3c4..2224788 100644 --- a/src/test/java/cloud/localstack/docker/DockerOnlySQSFunctionalityTest.java +++ b/src/test/java/cloud/localstack/docker/DockerOnlySQSFunctionalityTest.java @@ -93,6 +93,11 @@ public void testSQSRunning() throws Exception { TextMessage received = (TextMessage) consumer.receive(); Assertions.assertThat(received.getText()).isEqualTo("Hello World!"); + + // clean up + consumer.close(); + producer.close(); + connection.close(); } private SQSConnection createSQSConnection() throws Exception { From 55ec8f6ca3572c7d344e38d8a1ccab6f135c754d Mon Sep 17 00:00:00 2001 From: Waldemar Hummer Date: Tue, 25 Feb 2020 00:46:31 +0100 Subject: [PATCH 2/2] minor --- .travis.yml | 2 ++ Makefile | 2 +- src/main/java/cloud/localstack/Localstack.java | 2 +- .../cloud/localstack/deprecated/BasicFunctionalityTest.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2da118..a3671e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,9 @@ install: script: - set -e + - mvn -q -DskipTests compile - make test + - docker ps -a notifications: email: false diff --git a/Makefile b/Makefile index d6d15d9..cce0984 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,6 @@ publish-maven: ## Publish artifacts to Maven Central ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build test: ## Run tests for Java/JUnit compatibility - USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) -q test + USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) test .PHONY: usage clean install test diff --git a/src/main/java/cloud/localstack/Localstack.java b/src/main/java/cloud/localstack/Localstack.java index b24602a..3e5b575 100644 --- a/src/main/java/cloud/localstack/Localstack.java +++ b/src/main/java/cloud/localstack/Localstack.java @@ -91,7 +91,7 @@ public void startup(LocalstackDockerConfiguration dockerConfiguration) { } public void stop() { - if (this.localStackContainer != null) { + if (localStackContainer != null) { localStackContainer.stop(); } locked = false; diff --git a/src/test/java/cloud/localstack/deprecated/BasicFunctionalityTest.java b/src/test/java/cloud/localstack/deprecated/BasicFunctionalityTest.java index 65feb38..7280f89 100644 --- a/src/test/java/cloud/localstack/deprecated/BasicFunctionalityTest.java +++ b/src/test/java/cloud/localstack/deprecated/BasicFunctionalityTest.java @@ -37,7 +37,6 @@ import com.amazonaws.services.sqs.model.SendMessageResult; import org.assertj.core.api.Assertions; import org.junit.Assert; -import org.junit.Ignore; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.runner.RunWith; @@ -58,7 +57,8 @@ */ @RunWith(LocalstackOutsideDockerTestRunner.class) @ExtendWith(LocalstackExtension.class) -@Ignore +@org.junit.Ignore +@org.junit.jupiter.api.Disabled public class BasicFunctionalityTest { static {