Browse Source

JsonConverterTest @Isolated as it not suitable for any parallel test because the test changes global static JsonConverter settings

pull/10654/head
Sergey Matvienko 2 years ago
parent
commit
58374a1176
  1. 4
      common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
  2. 9
      common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java

4
common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java

@ -590,11 +590,11 @@ public class JsonConverter {
return GSON.fromJson(element, type);
}
public static void setTypeCastEnabled(boolean enabled) {
static void setTypeCastEnabled(boolean enabled) {
isTypeCastEnabled = enabled;
}
public static void setMaxStringValueLength(int length) {
static void setMaxStringValueLength(int length) {
maxStringValueLength = length;
}

9
common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java

@ -17,12 +17,15 @@ package org.thingsboard.server.common.adaptor;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Isolated;
import java.util.ArrayList;
@Isolated("JsonConverter static settings being modified")
public class JsonConverterTest {
@BeforeEach
@ -30,6 +33,12 @@ public class JsonConverterTest {
JsonConverter.setTypeCastEnabled(true);
}
@AfterEach
public void after() {
//restore default state for a static class
JsonConverter.setTypeCastEnabled(true);
}
@Test
public void testParseBigDecimalAsLong() {
var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1E+1}"), 0L);

Loading…
Cancel
Save