From 292d91d851b3f28f5e3f2053d1f972fc6b1ef9d5 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 18 May 2021 19:02:37 +0200
Subject: [PATCH] towards releasing 0.3.1
- different mqtt port not testable using current CI setup (only port 1883 exposed in image)
- print compiler error messages in single log output statement
---
.gitlab-ci.yml | 3 ---
.../jastadd/ragconnect/compiler/Compiler.java | 5 ++--
.../ragconnect/tests/MqttHandlerTest.java | 24 -------------------
.../jastadd/ragconnect/tests/TestUtils.java | 10 --------
4 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d80f0e..56c0e1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,9 +34,6 @@ test:
services:
- name: "eclipse-mosquitto:1.6"
alias: "mqtt"
- - name: "eclipse-mosquitto:1.6"
- alias: "mqtt_different_port"
- command: ["mosquitto", "-p", "55883"]
needs:
- build
script:
diff --git a/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java b/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java
index 449c1d8..5f7e914 100644
--- a/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java
+++ b/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java
@@ -70,10 +70,11 @@ public class Compiler extends AbstractCompiler {
RagConnect ragConnect = parseProgram(getConfiguration().getFiles());
if (!ragConnect.errors().isEmpty()) {
- LOGGER.severe("Errors:");
+ StringBuilder sb = new StringBuilder("Errors:\n");
for (ErrorMessage e : ragConnect.errors()) {
- LOGGER.severe(e.toString());
+ sb.append(e).append("\n");
}
+ LOGGER.severe(sb::toString);
System.exit(1);
}
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/MqttHandlerTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/MqttHandlerTest.java
index f8388fd..091990a 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/MqttHandlerTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/MqttHandlerTest.java
@@ -1,8 +1,6 @@
package org.jastadd.ragconnect.tests;
import example.ast.MqttHandler;
-import org.assertj.core.api.Assertions;
-import org.assertj.core.api.Assumptions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -21,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
* @author rschoene - Initial contribution
*/
-@Tag("New")
@Tag("mqtt")
public class MqttHandlerTest {
@@ -55,7 +52,6 @@ public class MqttHandlerTest {
assertEquals(1, receivedMessages.size());
}
-
@Test
public void testDontSendWelcomeMessage() throws Exception {
MqttHandler welcomeMessageSubscriber = new MqttHandler();
@@ -73,24 +69,4 @@ public class MqttHandlerTest {
assertThat(receivedMessages).isEmpty();
}
- @Test
- public void testSecondHost() throws Exception {
- // only run this if we have a second mqtt broker running
- Assumptions.assumeThat(TestUtils.getSecondMqttHost()).isNotNull();
-
- MqttHandler welcomeMessageSubscriber = new MqttHandler();
- List<String> receivedMessages = new ArrayList<>();
- welcomeMessageSubscriber.setHost(TestUtils.getSecondMqttHost());
- assertTrue(welcomeMessageSubscriber.waitUntilReady(2, TimeUnit.SECONDS));
- welcomeMessageSubscriber.newConnection("components", bytes -> receivedMessages.add(new String(bytes)));
- assertThat(receivedMessages).isEmpty();
-
- MqttHandler handler = new MqttHandler();
- handler.setHost(TestUtils.getSecondMqttHost());
- assertTrue(handler.waitUntilReady(2, TimeUnit.SECONDS));
- TestUtils.waitForMqtt();
-
- assertEquals(1, receivedMessages.size());
- }
-
}
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
index 53d737c..2d08ccb 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
@@ -29,16 +29,6 @@ public class TestUtils {
}
}
- public static String getSecondMqttHost() {
- if (System.getenv("GITLAB_CI") != null) {
- // we are in the CI, so use "mqtt_different_port" as host and 55883 as port
- return "mqtt_different_port:55883";
- } {
- // else no second local mqtt broker
- return null;
- }
- }
-
public static String mqttUri(String path) {
return "mqtt://" + getMqttHost() + "/" + path;
}
--
GitLab