diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java index b85c8984bc..97d77ad9bf 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import lombok.extern.slf4j.Slf4j; import org.apache.http.conn.ssl.TrustStrategy; import org.apache.http.ssl.SSLContextBuilder; @@ -37,10 +36,8 @@ import java.util.*; @Listeners(TestListener.class) public abstract class AbstractContainerTest { protected static long timeoutMultiplier = 1; - protected ObjectMapper mapper = new ObjectMapper(); - protected JsonParser jsonParser = new JsonParser(); - protected ContainerTestSuite containerTestSuite = ContainerTestSuite.getInstance(); + private static final ContainerTestSuite containerTestSuite = ContainerTestSuite.getInstance(); protected static TestRestClient testRestClient; @BeforeSuite @@ -95,27 +92,6 @@ public abstract class AbstractContainerTest { .build(); } - protected JsonObject createGatewayConnectPayload(String deviceName){ - JsonObject payload = new JsonObject(); - payload.addProperty("device", deviceName); - return payload; - } - - protected JsonObject createGatewayPayload(String deviceName, long ts){ - JsonObject payload = new JsonObject(); - payload.add(deviceName, createGatewayTelemetryArray(ts)); - return payload; - } - - protected JsonArray createGatewayTelemetryArray(long ts){ - JsonArray telemetryArray = new JsonArray(); - if (ts > 0) - telemetryArray.add(createPayload(ts)); - else - telemetryArray.add(createPayload()); - return telemetryArray; - } - protected JsonObject createPayload(long ts) { JsonObject values = createPayload(); JsonObject payload = new JsonObject();