From 5a8bded35fdd66b84a8f50b735c93e2b95746025 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Tue, 30 Apr 2024 18:28:37 +0200 Subject: [PATCH 1/3] JUnit5 migration in msa. Signed-off-by: Oleksandra Matviienko --- msa/black-box-tests/pom.xml | 5 ----- msa/vc-executor/pom.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index f1b7525438..f433b1930c 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -63,11 +63,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - org.testng testng diff --git a/msa/vc-executor/pom.xml b/msa/vc-executor/pom.xml index 34340ab08c..081ebd1d3c 100644 --- a/msa/vc-executor/pom.xml +++ b/msa/vc-executor/pom.xml @@ -75,11 +75,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - org.awaitility awaitility From 316305aea8f9e3abcff13b6cc1a40dca06322985 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Fri, 3 May 2024 13:06:46 +0200 Subject: [PATCH 2/3] msa tests: JUnit4 org.junit.Assert replaced with assertJ --- .../org/thingsboard/server/msa/AbstractLwm2mClientTest.java | 3 +-- .../server/msa/connectivity/lwm2m/LwM2MTestClient.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java index d0a8b53c32..c0ae8e9776 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.eclipse.leshan.client.object.Security; import org.eclipse.leshan.core.util.Hex; -import org.junit.Assert; import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.common.util.ThingsBoardThreadFactory; import org.thingsboard.server.common.data.Device; @@ -141,7 +140,7 @@ public class AbstractLwm2mClientTest extends AbstractContainerTest{ log.warn("msa basicTestConnection update -> finishState: [{}] states: {}", finishState, lwM2MTestClient.getClientStates()); return lwM2MTestClient.getClientStates().contains(finishState) || lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS); }); - Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccess)); + assertThat(lwM2MTestClient.getClientStates()).containsAll(expectedStatusesRegistrationLwm2mSuccess); } public LwM2MTestClient createNewClient(Security security, diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java index 9b1ab4bd22..c9f193704b 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java @@ -50,7 +50,6 @@ import org.eclipse.leshan.core.request.BootstrapRequest; import org.eclipse.leshan.core.request.DeregisterRequest; import org.eclipse.leshan.core.request.RegisterRequest; import org.eclipse.leshan.core.request.UpdateRequest; -import org.junit.Assert; import org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState; import java.io.IOException; @@ -63,6 +62,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY; import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL; @@ -107,7 +107,7 @@ public class LwM2MTestClient { private Map clientDtlsCid; public void init(Security security, int clientPort) throws InvalidDDFFileException, IOException { - Assert.assertNull("client already initialized", leshanClient); + assertThat(leshanClient).as("client already initialized").isNull(); List models = new ArrayList<>(); for (String resourceName : resources) { From bdf577710e6dc7d8101bd80ecf7157ec9db1b8fb Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Tue, 7 May 2024 15:41:23 +0200 Subject: [PATCH 3/3] Mocks the few JUnit4 classes that testcontainers needs for successful compilation. Signed-off-by: Oleksandra Matviienko --- msa/black-box-tests/pom.xml | 5 +++++ pom.xml | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index f433b1930c..4c81e0f31f 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -43,6 +43,11 @@ testcontainers test + + software.xdev + testcontainers-junit4-mock + test + org.zeroturnaround zt-exec diff --git a/pom.xml b/pom.xml index 74c095c857..bf15107acd 100755 --- a/pom.xml +++ b/pom.xml @@ -148,6 +148,7 @@ 5.4.0 2.2 1.19.7 + 1.0.1 1.12 4.19.1 5.8.0 @@ -2125,6 +2126,14 @@ + + + software.xdev + testcontainers-junit4-mock + ${testcontainers-junit4-mock.version} + test + org.zeroturnaround zt-exec