Merge pull request #4910 from ShvaykaD/improvements/proto-telemetry-tests

[3.3.1] improved tests for proto fields explicit presence validation

application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/AbstractCoapAttributesIntegrationTest.java

@@ -154,15 +154,6 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
                 case "key1":
                     assertEquals("", value);
                     break;
-                case "key2":
-                    assertEquals(false, value);
-                    break;
-                case "key3":
-                    assertEquals(0.0, value);
-                    break;
-                case "key4":
-                    assertEquals(0, value);
-                    break;
                 case "key5":
                     assertNotNull(value);
                     assertEquals(2, ((LinkedHashMap) value).size());

application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/AbstractCoapAttributesProtoIntegrationTest.java

@@ -123,12 +123,9 @@ public abstract class AbstractCoapAttributesProtoIntegrationTest extends Abstrac
         assertNotNull(postAttributesMsgDescriptor);
         DynamicMessage postAttributesMsg = postAttributesBuilder
                 .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "")
-                .setField(postAttributesMsgDescriptor.findFieldByName("key2"), false)
-                .setField(postAttributesMsgDescriptor.findFieldByName("key3"), 0.0)
-                .setField(postAttributesMsgDescriptor.findFieldByName("key4"), 0)
                 .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject)
                 .build();
-        processAttributesTest(Arrays.asList("key1", "key2", "key3", "key4", "key5"), postAttributesMsg.toByteArray(), true);
+        processAttributesTest(Arrays.asList("key1", "key5"), postAttributesMsg.toByteArray(), true);
     }
 
 }

application/src/test/java/org/thingsboard/server/transport/coap/telemetry/timeseries/AbstractCoapTimeseriesProtoIntegrationTest.java

@@ -207,10 +207,9 @@ public abstract class AbstractCoapTimeseriesProtoIntegrationTest extends Abstrac
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "")
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), false)
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 0.0)
-                .setField(postTelemetryMsgDescriptor.findFieldByName("key4"), 0)
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject)
                 .build();
-        processTestPostTelemetry(postTelemetryMsg.toByteArray(), Arrays.asList("key1", "key2", "key3", "key4", "key5"), false, true);
+        processTestPostTelemetry(postTelemetryMsg.toByteArray(), Arrays.asList("key1", "key2", "key3", "key5"), false, true);
     }
 
     @Test

application/src/test/java/org/thingsboard/server/transport/mqtt/telemetry/attributes/AbstractMqttAttributesIntegrationTest.java

@@ -192,15 +192,6 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
                 case "key1":
                     assertEquals("", value);
                     break;
-                case "key2":
-                    assertEquals(false, value);
-                    break;
-                case "key3":
-                    assertEquals(0.0, value);
-                    break;
-                case "key4":
-                    assertEquals(0, value);
-                    break;
                 case "key5":
                     assertNotNull(value);
                     assertEquals(2, ((LinkedHashMap) value).size());

application/src/test/java/org/thingsboard/server/transport/mqtt/telemetry/attributes/AbstractMqttAttributesProtoIntegrationTest.java

@@ -119,12 +119,9 @@ public abstract class AbstractMqttAttributesProtoIntegrationTest extends Abstrac
         assertNotNull(postAttributesMsgDescriptor);
         DynamicMessage postAttributesMsg = postAttributesBuilder
                 .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "")
-                .setField(postAttributesMsgDescriptor.findFieldByName("key2"), false)
-                .setField(postAttributesMsgDescriptor.findFieldByName("key3"), 0.0)
-                .setField(postAttributesMsgDescriptor.findFieldByName("key4"), 0)
                 .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject)
                 .build();
-        processAttributesTest(POST_DATA_ATTRIBUTES_TOPIC, Arrays.asList("key1", "key2", "key3", "key4", "key5"), postAttributesMsg.toByteArray(), true);
+        processAttributesTest(POST_DATA_ATTRIBUTES_TOPIC, Arrays.asList("key1", "key5"), postAttributesMsg.toByteArray(), true);
     }
 
     @Test

application/src/test/java/org/thingsboard/server/transport/mqtt/telemetry/timeseries/AbstractMqttTimeseriesProtoIntegrationTest.java

@@ -204,10 +204,9 @@ public abstract class AbstractMqttTimeseriesProtoIntegrationTest extends Abstrac
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "")
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), false)
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 0.0)
-                .setField(postTelemetryMsgDescriptor.findFieldByName("key4"), 0)
                 .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject)
                 .build();
-        processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, Arrays.asList("key1", "key2", "key3", "key4", "key5"), postTelemetryMsg.toByteArray(), false, true);
+        processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, Arrays.asList("key1", "key2", "key3", "key5"), postTelemetryMsg.toByteArray(), false, true);
     }
 
     @Test