From e20920d5ca49f205b30bf9ef2adf2079e9fc8c43 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 7 Jun 2022 17:24:49 +0200
Subject: [PATCH] Working on bugfixes for attributes
- cleanup
---
.../java/org/jastadd/ragconnect/tests/AttributeTest.java | 3 ---
.../org/jastadd/ragconnect/tests/IndexedSendTest.java | 8 +++-----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/AttributeTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/AttributeTest.java
index a0336d4..20ff9f3 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/AttributeTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/AttributeTest.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.*;
* @author rschoene - Initial contribution
*/
@Tag("Incremental")
-@Tag("New")
public class AttributeTest extends AbstractMqttTest {
private static final String TOPIC_WILDCARD = "attr/#";
@@ -180,7 +179,6 @@ public class AttributeTest extends AbstractMqttTest {
senderString.setInput("test-01");
checker.check();
- // TODO check checks for (circular and) collection
senderString.addA(new A().setValue("test-02").setInner(new Inner().setInnerValue("inner")));
checker.addToNumberOfValues(2) // collection(2)
.put(CHECK_COLLECTION, "[test-01, test-02]")
@@ -289,7 +287,6 @@ public class AttributeTest extends AbstractMqttTest {
private void checkCollection(String name, String expected) {
if (expected != null) {
- // TODO probably need to tokenize actual and expected, and compare their elements without order
assertThat(receiverRoot.getFromCollectionWithMapping()).hasSizeGreaterThan(4).endsWith("post");
checkCollectionContent(name, expected, receiverRoot.getFromCollectionNoMapping());
checkCollectionContent(name + " mapped", expected, receiverRoot.getFromCollectionWithMapping().substring(0, receiverRoot.getFromCollectionWithMapping().length() - 4));
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IndexedSendTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IndexedSendTest.java
index d649168..dc1bdda 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IndexedSendTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IndexedSendTest.java
@@ -1,10 +1,10 @@
package org.jastadd.ragconnect.tests;
import indexedSendInc.ast.*;
+import io.github.artsok.RepeatedIfExceptionsTest;
import org.assertj.core.api.Assertions;
import org.assertj.core.groups.Tuple;
import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.concurrent.Callable;
@@ -141,8 +141,7 @@ public class IndexedSendTest extends AbstractMqttTest {
}
@Tag("mqtt")
-// @RepeatedIfExceptionsTest(repeats = TEST_REPETITIONS)
- @Test
+ @RepeatedIfExceptionsTest(repeats = TEST_REPETITIONS)
public void testCommunicateSendInitialValueWithNTAs() throws IOException, InterruptedException {
this.writeCurrentValue = true;
this.connectNTAsInstead = true;
@@ -159,8 +158,7 @@ public class IndexedSendTest extends AbstractMqttTest {
}
@Tag("mqtt")
-// @RepeatedIfExceptionsTest(repeats = TEST_REPETITIONS)
- @Test
+ @RepeatedIfExceptionsTest(repeats = TEST_REPETITIONS)
public void testCommunicateOnlyUpdatedValueWithNTAs() throws IOException, InterruptedException {
this.writeCurrentValue = false;
this.connectNTAsInstead = true;
--
GitLab