Adding test for ms in timestamps (faucetsdn#1115)

Author: grafnu

.gencode_hash.txt

@@ -5,7 +5,7 @@ c21266e8de23b6e8acfac16a177db782375bf71df470c343c3f8eb8b822ef56a  gencode/docs/c
 0bb798c8db6be37266946569a096e2f0b7520ee54d65e7e8d37675ef17820f14  gencode/docs/configuration_endpoint.html
 d6a260ed6dca30f85d18ca7c96421d1a70204816b4fd382cca1716e18ed506e8  gencode/docs/configuration_execution.html
 11b21f73b6a4065102968a4c09979639b8a7ea6efb20e40d52cd21b2a60167bb  gencode/docs/configuration_pod.html
-01495c82f15040bb307cbfd39e0bbc7af21ce0d70008cbd19878a9046dcda814  gencode/docs/configuration_pubber.html
+78c229a63687a4cbda1d3f55fa640255613ea6b7a549e1a3782b0167d7466a9b  gencode/docs/configuration_pubber.html
 1057fa40fb7a31a23bb2773d21c38cf4590a935bd8b5ea4218e695c6204f5dd9  gencode/docs/data_template.html
 f2253f6f2797c3f3fcfe112b1e661b90f4dac8ad51e6415fd436e343df499c19  gencode/docs/events.html
 88ef0b31fc1f655152a0c8ced1c99ab0ef34eb6e37b1ed0b2354ad425f8a1570  gencode/docs/events_discovery.html
@@ -113,7 +113,7 @@ c73ad6dde0db8a520f3fee5a563c55a79fc7e6d1cd7875723b10c3d34036a46b  gencode/java/u
 9637f95e8a1185b1b028308a8caa2ca5a78cb46ae97f9cc11e2731066129540e  gencode/java/udmi/schema/Position.java
 d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463  gencode/java/udmi/schema/Properties.java
 4cdd5dc6b2e054a43f2e70adeb46ef8e3ff78288d4315923a925415f87e871aa  gencode/java/udmi/schema/PubberConfiguration.java
-3bf0638ae4606ba3c3a1daf477d41c19d88c2a07a3700da7a6a61a3eeb4b2c32  gencode/java/udmi/schema/PubberOptions.java
+63c1201e7a391c2cd5d0166c4a690d9cef9812383808023a7e48beb2f91c82e9  gencode/java/udmi/schema/PubberOptions.java
 cd2c7580a75391393c2f761f4434e4e7e83e2d2d1f35e9e62d69c19e65ea2557  gencode/java/udmi/schema/RefDiscovery.java
 14faa115d13ee46d10935b13753bff85758f3b64b5136a59f60d36b5b541687c  gencode/java/udmi/schema/SchemaValidationState.java
 fadf083200e73d46cfdec2f710d40e3d2bc4dbf05196e4d0900186e72b62d95e  gencode/java/udmi/schema/Scoring.java
@@ -209,7 +209,7 @@ b48ae013d203eb31cc388a084c0cc6f93d4d5534336d4da2ecbccd84a085ea2b  gencode/python
 5c50847e136a033ea511209238bb570499b43fbee6189dae06603132dcb9f01f  gencode/python/udmi/schema/model_testing_target.py
 7c9a755ae06c44fc2b8117d7918b6401ce08a7218b86033fb3320eda7286e581  gencode/python/udmi/schema/monitoring.py
 e7e0b1ff8a58b904f30169641e633abf9fe19420607a867eda371eb50a86304e  gencode/python/udmi/schema/monitoring_metric.py
-d59671d0bc2ac184e820b70c277cdf91af0a936a60cdffd9b3af0ea314f08adc  gencode/python/udmi/schema/options_pubber.py
+e5ea24cc0777064088497c9a05f8517398fccbf81b12db5e580c5653d2a4b973  gencode/python/udmi/schema/options_pubber.py
 6c5f3dd1c5ca9d821e3c48298af118fc7eafd97af9265dfd34b2ed8642efca77  gencode/python/udmi/schema/persistent_device.py
 a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690  gencode/python/udmi/schema/properties.py
 a84e00db471b2038a473c2c83d72ea59b02c3d2bab56d38bc22435309f01e763  gencode/python/udmi/schema/query_cloud.py

bin/gencode_java

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+source etc/shell_common.sh
+
 JVERSION=1.2.1
 JBASENAME=jsonschema2pojo
 MARKER=/tmp/.gencode_mark
@@ -64,14 +66,12 @@ for file in $dups; do
     base=${file%__1.java}.java
     versions=$(sha256sum $base $file | sort | awk '{print $1}' | uniq | wc -l)
     [[ $versions == 1 ]] || (
-        touch $MARKER
-        echo $versions of $base found
+        echo
+        echo Multiple $versions of $base found:
         ls -l $base $file
-        diff $base $file
-        fgrep ${base%.java}__ -r $OUTDIR
+        echo
     )
 done
-[[ ! -f $MARKER ]]
 
 echo Pruning all __ classes...
 find $OUTDIR -name \*__\*.java | xargs rm

etc/schema_itemized.out

@@ -9,6 +9,9 @@
 0 valid_serial_no RESULT pass schemas state_update_stable STABLE 10/10 Schema validation passed
 1 valid_serial_no RESULT pass schemas device_state_stable STABLE 10/10 Schema validation passed
 0 valid_serial_no RESULT pass schemas state_update_stable STABLE 10/10 Schema validation passed
+1 valid_serial_no RESULT pass schemas device_state_stable STABLE 10/10 Schema validation passed
+0 valid_serial_no RESULT pass schemas events_system_stable STABLE 10/10 Schema validation passed
+0 valid_serial_no RESULT pass schemas state_update_stable STABLE 10/10 Schema validation passed
 1 writeback_success
 1 writeback_success
 1 writeback_success

etc/test_itemized.in

@@ -6,6 +6,7 @@ TEST too_much_state spamState
 TEST enumerate_features featureEnableSwap
 TEST valid_serial_no noLastStart
 TEST valid_serial_no noFolder
+TEST valid_serial_no msTimestamp
 TEST writeback_success extraPoint=filter_differential_pressure_setpoint
 TEST writeback_success noWriteback
 TEST writeback_success noPointState

etc/test_itemized.out

@@ -6,6 +6,7 @@
 1 RESULT fail enumeration.features enumerate_features PREVIEW 0/10 Failed check that feature enumeration matches metadata: missing { enumeration }, extra { unknown }
 1 RESULT pass system valid_serial_no STABLE 10/10 Sequence complete
 1 RESULT pass system valid_serial_no STABLE 10/10 Sequence complete
+1 RESULT pass system valid_serial_no STABLE 10/10 Sequence complete
 1 RESULT fail writeback writeback_success ALPHA 0/10 Failed waiting until target point has value_state default (null): point filter_differential_pressure_setpoint is applied, expected null
 1 RESULT fail writeback writeback_success ALPHA 0/10 Failed waiting until target point has value_state applied: point filter_differential_pressure_setpoint is null, expected applied
 1 RESULT fail writeback writeback_success ALPHA 0/10 Failed waiting until target point has value_state applied: point filter_differential_pressure_setpoint is null, expected applied

gencode/docs/configuration_pubber.html

@@ -144,6 +144,10 @@ public boolean isBadCategory() {
     return isTrue(options.badCategory);
   }
 
+  public boolean isMsTimestamp() {
+    return isTrue(options.msTimestamp);
+  }
+
   public boolean isNoStatus() {
     return isTrue(options.noStatus);
   }

gencode/java/udmi/schema/PubberOptions.java

@@ -236,7 +236,7 @@ public void initializeMqtt() {
     String targetDeviceId = getTargetDeviceId(siteModel, config.deviceId);
     CertManager certManager = new CertManager(new File(siteModel.getReflectorDir(), "ca.crt"),
             siteModel.getDeviceDir(targetDeviceId), endpoint.transport, keyPassword, this::info);
-    deviceTarget = new MqttDevice(endpoint, this::publisherException, certManager);
+    deviceTarget = new MqttDevice(endpoint, this::publisherException, certManager, isMsTimestamp());
     publishDirtyState();
   }