Commit d8a10ccdfa8a53d91b0df7bc64b5b785a8b2cfa1
Committed by
GitHub
GitHub
Merge pull request #4910 from ShvaykaD/improvements/proto-telemetry-tests
[3.3.1] improved tests for proto fields explicit presence validation
Showing
6 changed files
with
4 additions
and
30 deletions
| @@ -154,15 +154,6 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap | @@ -154,15 +154,6 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap | ||
| 154 | case "key1": | 154 | case "key1": |
| 155 | assertEquals("", value); | 155 | assertEquals("", value); |
| 156 | break; | 156 | break; |
| 157 | - case "key2": | ||
| 158 | - assertEquals(false, value); | ||
| 159 | - break; | ||
| 160 | - case "key3": | ||
| 161 | - assertEquals(0.0, value); | ||
| 162 | - break; | ||
| 163 | - case "key4": | ||
| 164 | - assertEquals(0, value); | ||
| 165 | - break; | ||
| 166 | case "key5": | 157 | case "key5": |
| 167 | assertNotNull(value); | 158 | assertNotNull(value); |
| 168 | assertEquals(2, ((LinkedHashMap) value).size()); | 159 | assertEquals(2, ((LinkedHashMap) value).size()); |
| @@ -123,12 +123,9 @@ public abstract class AbstractCoapAttributesProtoIntegrationTest extends Abstrac | @@ -123,12 +123,9 @@ public abstract class AbstractCoapAttributesProtoIntegrationTest extends Abstrac | ||
| 123 | assertNotNull(postAttributesMsgDescriptor); | 123 | assertNotNull(postAttributesMsgDescriptor); |
| 124 | DynamicMessage postAttributesMsg = postAttributesBuilder | 124 | DynamicMessage postAttributesMsg = postAttributesBuilder |
| 125 | .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "") | 125 | .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "") |
| 126 | - .setField(postAttributesMsgDescriptor.findFieldByName("key2"), false) | ||
| 127 | - .setField(postAttributesMsgDescriptor.findFieldByName("key3"), 0.0) | ||
| 128 | - .setField(postAttributesMsgDescriptor.findFieldByName("key4"), 0) | ||
| 129 | .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject) | 126 | .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject) |
| 130 | .build(); | 127 | .build(); |
| 131 | - processAttributesTest(Arrays.asList("key1", "key2", "key3", "key4", "key5"), postAttributesMsg.toByteArray(), true); | 128 | + processAttributesTest(Arrays.asList("key1", "key5"), postAttributesMsg.toByteArray(), true); |
| 132 | } | 129 | } |
| 133 | 130 | ||
| 134 | } | 131 | } |
| @@ -207,10 +207,9 @@ public abstract class AbstractCoapTimeseriesProtoIntegrationTest extends Abstrac | @@ -207,10 +207,9 @@ public abstract class AbstractCoapTimeseriesProtoIntegrationTest extends Abstrac | ||
| 207 | .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "") | 207 | .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "") |
| 208 | .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), false) | 208 | .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), false) |
| 209 | .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 0.0) | 209 | .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 0.0) |
| 210 | - .setField(postTelemetryMsgDescriptor.findFieldByName("key4"), 0) | ||
| 211 | .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject) | 210 | .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject) |
| 212 | .build(); | 211 | .build(); |
| 213 | - processTestPostTelemetry(postTelemetryMsg.toByteArray(), Arrays.asList("key1", "key2", "key3", "key4", "key5"), false, true); | 212 | + processTestPostTelemetry(postTelemetryMsg.toByteArray(), Arrays.asList("key1", "key2", "key3", "key5"), false, true); |
| 214 | } | 213 | } |
| 215 | 214 | ||
| 216 | @Test | 215 | @Test |
| @@ -192,15 +192,6 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt | @@ -192,15 +192,6 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt | ||
| 192 | case "key1": | 192 | case "key1": |
| 193 | assertEquals("", value); | 193 | assertEquals("", value); |
| 194 | break; | 194 | break; |
| 195 | - case "key2": | ||
| 196 | - assertEquals(false, value); | ||
| 197 | - break; | ||
| 198 | - case "key3": | ||
| 199 | - assertEquals(0.0, value); | ||
| 200 | - break; | ||
| 201 | - case "key4": | ||
| 202 | - assertEquals(0, value); | ||
| 203 | - break; | ||
| 204 | case "key5": | 195 | case "key5": |
| 205 | assertNotNull(value); | 196 | assertNotNull(value); |
| 206 | assertEquals(2, ((LinkedHashMap) value).size()); | 197 | assertEquals(2, ((LinkedHashMap) value).size()); |
| @@ -119,12 +119,9 @@ public abstract class AbstractMqttAttributesProtoIntegrationTest extends Abstrac | @@ -119,12 +119,9 @@ public abstract class AbstractMqttAttributesProtoIntegrationTest extends Abstrac | ||
| 119 | assertNotNull(postAttributesMsgDescriptor); | 119 | assertNotNull(postAttributesMsgDescriptor); |
| 120 | DynamicMessage postAttributesMsg = postAttributesBuilder | 120 | DynamicMessage postAttributesMsg = postAttributesBuilder |
| 121 | .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "") | 121 | .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "") |
| 122 | - .setField(postAttributesMsgDescriptor.findFieldByName("key2"), false) | ||
| 123 | - .setField(postAttributesMsgDescriptor.findFieldByName("key3"), 0.0) | ||
| 124 | - .setField(postAttributesMsgDescriptor.findFieldByName("key4"), 0) | ||
| 125 | .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject) | 122 | .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject) |
| 126 | .build(); | 123 | .build(); |
| 127 | - processAttributesTest(POST_DATA_ATTRIBUTES_TOPIC, Arrays.asList("key1", "key2", "key3", "key4", "key5"), postAttributesMsg.toByteArray(), true); | 124 | + processAttributesTest(POST_DATA_ATTRIBUTES_TOPIC, Arrays.asList("key1", "key5"), postAttributesMsg.toByteArray(), true); |
| 128 | } | 125 | } |
| 129 | 126 | ||
| 130 | @Test | 127 | @Test |
| @@ -204,10 +204,9 @@ public abstract class AbstractMqttTimeseriesProtoIntegrationTest extends Abstrac | @@ -204,10 +204,9 @@ public abstract class AbstractMqttTimeseriesProtoIntegrationTest extends Abstrac | ||
| 204 | .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "") | 204 | .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "") |
| 205 | .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), false) | 205 | .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), false) |
| 206 | .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 0.0) | 206 | .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 0.0) |
| 207 | - .setField(postTelemetryMsgDescriptor.findFieldByName("key4"), 0) | ||
| 208 | .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject) | 207 | .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject) |
| 209 | .build(); | 208 | .build(); |
| 210 | - processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, Arrays.asList("key1", "key2", "key3", "key4", "key5"), postTelemetryMsg.toByteArray(), false, true); | 209 | + processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, Arrays.asList("key1", "key2", "key3", "key5"), postTelemetryMsg.toByteArray(), false, true); |
| 211 | } | 210 | } |
| 212 | 211 | ||
| 213 | @Test | 212 | @Test |