From 9e71c0b9fe6be13c3a31973fa92a1d586843c919 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Thu, 4 Nov 2021 14:50:11 +0200 Subject: [PATCH 1/3] EntityDataAdapterTest added to verify convertValue method --- .../dao/sql/query/EntityDataAdapter.java | 2 +- .../dao/sql/query/EntityDataAdapterTest.java | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java index 785ba69c7e..5450c43287 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java @@ -79,7 +79,7 @@ public class EntityDataAdapter { return entityData; } - private static String convertValue(Object value) { + static String convertValue(Object value) { if (value != null) { String strVal = value.toString(); // check number diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java new file mode 100644 index 0000000000..abbcb61d3b --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java @@ -0,0 +1,29 @@ +/** + * Copyright © 2016-2021 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.sql.query; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class EntityDataAdapterTest { + + @Test + void testConvertValue() { + assertThat(EntityDataAdapter.convertValue("500")).isEqualTo("500"); + assertThat(EntityDataAdapter.convertValue("500D")).isEqualTo("500D"); //do not convert to Double !!! + } +} From 3c340dc7d2a3c9cf1ecc73cd643c0de833a6a863 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Mon, 8 Nov 2021 13:51:37 +0200 Subject: [PATCH 2/3] tests added for update service for convertDeviceProfileAlarmRulesForVersion330 --- dao/pom.xml | 2 +- .../server/dao/sql/query/EntityDataAdapterTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dao/pom.xml b/dao/pom.xml index f490a0e8e5..b8be6e3439 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -256,7 +256,7 @@ **/sql/*Test.java - **/sql/*/*Test.java + **/sql/*/*DaoTest.java **/psql/*Test.java **/nosql/*Test.java diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java index abbcb61d3b..ede58da57d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java @@ -15,14 +15,14 @@ */ package org.thingsboard.server.dao.sql.query; -import org.junit.jupiter.api.Test; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -class EntityDataAdapterTest { +public class EntityDataAdapterTest { @Test - void testConvertValue() { + public void testConvertValue() { assertThat(EntityDataAdapter.convertValue("500")).isEqualTo("500"); assertThat(EntityDataAdapter.convertValue("500D")).isEqualTo("500D"); //do not convert to Double !!! } From e680b33c9c94aa06ea39c0ee6f04939ad0d7e406 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Mon, 13 Dec 2021 19:40:01 +0200 Subject: [PATCH 3/3] fixed EntityDataAdapter.convertValue that convert "500D" (valid Java number) into "500" as double. --- .../org/thingsboard/server/dao/sql/query/EntityDataAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java index 5450c43287..a25a5f6201 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java @@ -83,7 +83,7 @@ public class EntityDataAdapter { if (value != null) { String strVal = value.toString(); // check number - if (NumberUtils.isNumber(strVal)) { + if (strVal.length() > 0 && NumberUtils.isParsable(strVal)) { try { long longVal = Long.parseLong(strVal); return Long.toString(longVal);