Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring of sequence testing code #299

Merged
merged 7 commits into from
Apr 19, 2022
Merged

Refactoring of sequence testing code #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b20c92b
Baseline
grafnu Apr 19, 2022
3af7589
FIxing typo
grafnu Apr 19, 2022
3cfdfc7
Importing schema changes
grafnu Apr 19, 2022
0bda9b6
Fixes
grafnu Apr 19, 2022
04a99d5
Gencode
grafnu Apr 19, 2022
39badd6
Linty
grafnu Apr 19, 2022
9266191
review updates
grafnu Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions .gencode_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
477bfaa6fe5b2e55a2afaa3c3897e19a090c490f8a14344a84240420289e8ef6 gencode/docs/config.html
97695067e507720ef649cca27a0eb9ebf9ba8bebe31898289b7d6586a9ada6db gencode/docs/config.html
e2944b13db5ff06be9caea51d03bca48f2cb093a8bb583dca14051255d34ea6b gencode/docs/envelope.html
559379abd267e9719a2bee98e56c21301853b6f69bc37fddc501acc57ce7cd63 gencode/docs/event_discovery.html
987503860562a3971314a98d75890b6c7615fee84bff6bede7010231f469c035 gencode/docs/event_pointset.html
e3fb2b1a96f6fcb06f5af6cff32829abc825065ed52de81c3d379c8c8070fe09 gencode/docs/event_system.html
a82821e72af6d0ee35800e6262eb9bb05256309b98aed2dad1a368fd2d6882bb gencode/docs/index.html
1ab355f19f6de50e2c91ba5f05161e0d6347d92f9b70dd96ce4d4188ebdd6d7e gencode/docs/metadata.html
9cd65f81a5c6441faba3424922520f29e4987a8827c39dc031b6611f8c920533 gencode/docs/metadata.html
741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930 gencode/docs/schema_doc.css
878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9 gencode/docs/schema_doc.min.js
7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a gencode/docs/schema_extras.js
7c956996257531d257f72b3c9c190fe41a37d6e06bdb8ac43a06bb3ead94e501 gencode/docs/state.html
891b85eed0ddee056dc8158b82427229aeaa1b2bf3ab2dd36f8f5ba0fdabeb60 gencode/docs/state.html
68f8919d59556c7c781958baaac0b8cc629b6c4ce86e6ffd0171d23536747ec6 gencode/java/udmi/schema/Ancillary.java
d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b gencode/java/udmi/schema/Asset.java
9a6088ab93e6de9107ba4c91e5ed19375d16a24baaec6ab5998e1c6351d5bba9 gencode/java/udmi/schema/AuditEvent.java
Expand All @@ -30,46 +30,46 @@ e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e gencode/java/u
aa0885ca43ab38c7597eacc38b7c512940a1a9fa061abd47d02c28e66b6fd93e gencode/java/udmi/schema/FamilyDiscoveryConfig.java
ae4a645f199c8e24b3303463d428ca17af7603ae9ae9238397a6a82e752ab454 gencode/java/udmi/schema/FamilyDiscoveryEvent.java
0afc15acd72874e5a0c47f546abc0c4569f5bc37838fdcac77bc7bd55cc53a6d gencode/java/udmi/schema/FamilyDiscoveryState.java
d7aeee0fe20a8dd8d92e43e10d5b563ba4d70cb259f17c5818f3a0a4eed1e2ec gencode/java/udmi/schema/FamilyLocalnetMetadata.java
60a8115ae1acae7c199b63180823198d38ec50d57b48dd85aca1ccc865058f85 gencode/java/udmi/schema/GatewayConfig.java
4e9a913d5cf47a5901a63ec005115c58884e06c2cd6ba6bb786ffbb7c7fdaf74 gencode/java/udmi/schema/GatewayMetadata.java
d79f50da651f376ec06bfe3b16bc76eae599d313240022894164ddbcc25c081c gencode/java/udmi/schema/GatewayMetadata.java
e0e7739046e834c0f0ca6a70b38b4579618899be3162887a0fa7ab60bbff22a5 gencode/java/udmi/schema/GatewayState.java
a5e5adfc187709e8646a11c92e804acfb67743f9d72149008aaca954df3177f6 gencode/java/udmi/schema/Level.java
f53c891932643871f93368cfe797cac6fd4ed0f64e71c893f275cd7184cb8019 gencode/java/udmi/schema/LocalnetConfig.java
fc2bf2d94a9cbfb600a381c7b3dad66850b2646a388183848e913de1b102a40f gencode/java/udmi/schema/LocalnetMetadata.java
07fd4911363437b274c19b024759b04b116152176702da8d4203c4ff4cb55b7f gencode/java/udmi/schema/LocalnetConfig.java
419f04e56922a444c6cc1148796108df2c804cbe139f42b5505c3c48303a573c gencode/java/udmi/schema/LocalnetMetadata.java
2df4ae32d0bbecc21f7c3f6a416a195baa766a6210cfa8abca4a7bb45b9c7961 gencode/java/udmi/schema/Location.java
09b7447c86ae5361019be8f6c12d80465679f5525fc1a4528607642c0d5f035d gencode/java/udmi/schema/Metadata.java
ceba95d0586f995eacc52defcf91cd91226e88891a01a0761770853de9dcdf5d gencode/java/udmi/schema/Metadata.java
a4e8f69100ab678a8236f481c558d677bbaea3e76c853bbd9262113d2a9c031d gencode/java/udmi/schema/Metrics.java
5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8 gencode/java/udmi/schema/Physical_tag.java
0868f0a9beb671dd08f066e7e7e796531fe151307a0b853b1f1a1aafe50ee746 gencode/java/udmi/schema/PointEnumerationEvent.java
2cca321fb2fbc00d2082fd918062f6b02e8f2dbe1359c0fbb6a3f47a946838c7 gencode/java/udmi/schema/PointPointsetConfig.java
8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec gencode/java/udmi/schema/PointPointsetEvent.java
09a99eddb418ef56a4744f94a1d15815e5c460c5e2bd0ea2badfc0662986a853 gencode/java/udmi/schema/PointPointsetMetadata.java
db8d6dd3498019ad12e0f328b6237d07e52f133f8b08858b712611a52c198009 gencode/java/udmi/schema/PointPointsetState.java
3d973f05d67b53fe25cfa1780e13d3a09fea53e64241d9e4c18734d370004fec gencode/java/udmi/schema/PointsetConfig.java
c6a0571e228490defcb8fba335220b23247aea0e0cb9b657efc1e1e6dbcc0fb3 gencode/java/udmi/schema/PointsetConfig.java
f3aea029530d0d8c6f50a75f266fd222d3f5ad92004f40675d6a99c906d22c82 gencode/java/udmi/schema/PointsetEvent.java
7987adebea9103a857493bb7698913d0891fcb4a77cec0e208c655953df82243 gencode/java/udmi/schema/PointsetMetadata.java
37d1918ba0a79d60497b3ee4827f714054047bfa1e592f95fdd962f00ff6f4ff gencode/java/udmi/schema/PointsetState.java
fc3a9415c04d8a06954dbdbfdff5d68ab113cce3948532c19df555778ffb04fa gencode/java/udmi/schema/PointsetState.java
ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a gencode/java/udmi/schema/Position.java
6ddce136f5e34e7e8c7d101c8a729f1fdd323befdfa52590ebdf0028f970bdf5 gencode/java/udmi/schema/Properties.java
0a1a025dde88fd46925cbb56f5179ed2803ea97948292809ff328a5201d90a3e gencode/java/udmi/schema/State.java
b4ea53b14862fa50403cdfc481d55ea2b2eb5e3b3aae43d54c9181114e8fff04 gencode/java/udmi/schema/SubsystemLocalnetMetadata.java
6b8b054c5fa2baef5163d42cd6bf1b0aeb4d07aa881529d81f4ae7dfa4c2906e gencode/java/udmi/schema/SystemConfig.java
8075f2133463e55ac24fccf9391c94698c580b860ad1a0901d5346a2f369030b gencode/java/udmi/schema/SystemEvent.java
c46848327791cec1f1e62dbee2ad66951af7f61ed3c56eeaa8e563774e305bf4 gencode/java/udmi/schema/SystemMetadata.java
451217e2cce0ae9224a86f35b3bdea14b36658efe6f94f4a2dff4f4b1dc51cf7 gencode/java/udmi/schema/SystemState.java
dfe4bb7c9ba6e366a967ff475883a8ff33fc558ae51db5c71fafae2323d0f8eb gencode/java/udmi/schema/Target.java
27d6b50dc51b373d24a701728b4d43d31fe841a9a1d77fe3e45dac332674c308 gencode/java/udmi/schema/TargetTestingMetadata.java
a77e801f3b07cd8b7042adfe8e5e62d7a83b63a1b449a356fa13c846811ab576 gencode/java/udmi/schema/TestingMetadata.java
4a15cf7df6350ade702cd702f3a5d9c2b7bc27d342b2cb9f4134f199e3250fd3 gencode/python/udmi/schema/__init__.py
7d6dd13e368e7f073738fee69c15e18652a9b7d7ac63bde0a200f747e3aa1b1d gencode/java/udmi/schema/TargetTestingModel.java
d3968b92497e83a63f18cc0e74484a9807f1bb92db0c92d556ec2caaa143d645 gencode/java/udmi/schema/TestingModel.java
dbc4084bb91080a350e862ecd8ffab786e677a0d18d4c77857c7546d78d9fe25 gencode/python/udmi/schema/__init__.py
704c8f0eec0b87015af8f7e524375f651b3d35f659ec89b4b022f8c1d0813ec5 gencode/python/udmi/schema/common.py
b975892df78076dabc797b4c0be87f20b33eacda11f9d1ac1c09be33d4937a87 gencode/python/udmi/schema/config.py
191e1926c16b55f4ef350a711f540eef17a0ec60bec8c193c94182786dc3624b gencode/python/udmi/schema/config_blobset.py
7abd40beb86ebd7eaeaacdeba895b95563b79b651ad2cfd73bdcac865c90a3a9 gencode/python/udmi/schema/config_blobset_blob.py
ec6c6ab1fb0f37a29b7ebd162aa77da7f1e261e80da376942a3b39d17ccf1be4 gencode/python/udmi/schema/config_discovery.py
a5edb9ac5ecd5a4459f93ce613691735f299f35718f2e35410206fc91c263dd1 gencode/python/udmi/schema/config_discovery_family.py
b461bdc24310ef972faf579b5be577b5af67fb0977d6afb4c42955211b26e3d5 gencode/python/udmi/schema/config_gateway.py
30a3402a54386032928bda5b9e60e5fd9ac47c53b4ffc5679fe24d24901ed660 gencode/python/udmi/schema/config_localnet.py
f816f18ba2e9594a351b040425f4efe2f1f0f654307ac8213dc7603fe1402814 gencode/python/udmi/schema/config_pointset.py
573573ad49760e95ed140c7ff76dd7884aee3c47145f635c7b9e5b8c940dddcb gencode/python/udmi/schema/config_localnet.py
9eab64849e04b25203d5da47856c3f8dda2b96903e4dc43ab932ee35014700bd gencode/python/udmi/schema/config_pointset.py
3f23e78163fdc4a2638b2691fdf3f45f1547e8f9b605073339b16e76d894d401 gencode/python/udmi/schema/config_pointset_point.py
1c178f298884d66c72b295319f3e29b4178b0eaf5201aebd93ba80699e7466d5 gencode/python/udmi/schema/config_system.py
631371489cb1275517bebcc4040cbc655d18ca147ab540701b3fd9cedba138c5 gencode/python/udmi/schema/envelope.py
Expand All @@ -82,23 +82,23 @@ ad33b91a7fabb4eed7e49c30a983a2106c96330facbe0f376f94d06e2263d6d0 gencode/python
ddf849bfeb2b87d071cefd5e6feacabc57375a7fff6d72b6d42ffb89f33c859b gencode/python/udmi/schema/event_pointset.py
44aff1bc930dbdbadd51ac3fe0e7d9c83ad84a6a9f9d1c809b3fce66cbcd5e00 gencode/python/udmi/schema/event_pointset_point.py
a27b3b2ace3f301b5fa08a3763f792158f9725a5fbed5cd7b5fac8a6701080e4 gencode/python/udmi/schema/event_system.py
b1271f8c9fb880a7b77e17d8e8923cf11966eaa9cbee2905e17b4e3355843b3e gencode/python/udmi/schema/metadata.py
c5434d7d243b1c14f948129ec4c05e7545801e56112f44523ad335878b26e651 gencode/python/udmi/schema/metadata_cloud.py
4489d99f73617e9fcb340f5b249df67ebfb9b3340ef9d33c61fac789a62fdac9 gencode/python/udmi/schema/metadata_gateway.py
752cf1f2ef9af6e98041abbe884867635218974d7a0d7eb3002e1d4d7e48f228 gencode/python/udmi/schema/metadata_localnet.py
8c8c26a54dcb7589b66dc5488abe9fbd7bc850ee60e02dfc242af06722640487 gencode/python/udmi/schema/metadata_localnet_subsystem.py
e83d9f37f175d1724ed85e68f3f091c2310462eaf7adef83575d34f2a8b8a918 gencode/python/udmi/schema/metadata_pointset.py
b0dc5e2a58d41ad30853aff922496f1fdc14c1eee9661669c47662822c6268ad gencode/python/udmi/schema/metadata_pointset_point.py
833b546d9a312ebdd20a0e0f8903b86e5c5d0f66f30c19958b312cc0c17f65d9 gencode/python/udmi/schema/metadata_system.py
207e41740284137eea08b6b5f36dcfdc4d3e92c717d5c65834f09e229b0b0058 gencode/python/udmi/schema/metadata_testing.py
d11882163bbc419da1ee4309062795b2e2fad31a6359927e1897e00b1e3ada55 gencode/python/udmi/schema/metadata_testing_target.py
5052a13ce3b3b7affd607a62a8d919b79b464e1352e03fc35799f22996a4aa7a gencode/python/udmi/schema/metadata.py
defe9fcce671ff4ac1a91b9d60ff2260f60865a13fba29c032ff356b1b79f471 gencode/python/udmi/schema/model_cloud.py
1fb8473dd0f2b083ce7daf00a65121893ee5c88ba6999b4950813e4b914a514c gencode/python/udmi/schema/model_gateway.py
89ce7a460f6cba70b067329d2b58814fc2adfee9f783890b148babdceb1f5d2a gencode/python/udmi/schema/model_localnet.py
c1ebc4c6885a3299156300e27cefe63e3b745f595882e0e2be88bb61435d0752 gencode/python/udmi/schema/model_localnet_family.py
b0cfc2a86539f3525f2da52d7b0422bb8934348690f25d9ab64c38e7a8a20536 gencode/python/udmi/schema/model_pointset.py
347b1ee16f74b8cdfa83aa4e179af5a5529545daf1736baf401936c7cf9e7809 gencode/python/udmi/schema/model_pointset_point.py
cd00563a4e0be9112f6d8af3335acc12b0d3354beab602ab924aac59a0f588e4 gencode/python/udmi/schema/model_system.py
aafe6e70c281152db958adf77a024e3e9fab8293927106297c5ec48c11f54e27 gencode/python/udmi/schema/model_testing.py
5c50847e136a033ea511209238bb570499b43fbee6189dae06603132dcb9f01f gencode/python/udmi/schema/model_testing_target.py
a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690 gencode/python/udmi/schema/properties.py
32bc70a30e37e89cfae14b44add18d546a6f9e00a3ec3519ede9c7486114d39c gencode/python/udmi/schema/state.py
c8c8ecae303d9c96fb7a97106d722b32db8c3728a44a46db028cf0376d9dc79f gencode/python/udmi/schema/state_blobset.py
a5a914cb5d74c29671a4d29dfa6c700b3fec27d695d607e28814ad31307e82da gencode/python/udmi/schema/state_blobset_blob.py
26443a1f6d0be3469ff93aa7fdb4e6682e0439a3b29a8e237998dcebec5f6901 gencode/python/udmi/schema/state_discovery.py
187400078dfc89912062ca1ad92f61e32d28126ae56119d83e6767d58cda1117 gencode/python/udmi/schema/state_discovery_family.py
05e82aa15c64842e206ae8ce3d5810d115bb890d009ea5d657822fad0e0d2165 gencode/python/udmi/schema/state_gateway.py
8bac9baabe83e2bf682b6376fee1eba2564a34c867f47f0c73eda44d6b3d8bb1 gencode/python/udmi/schema/state_pointset.py
3520ad936af70b414d9e7f90e606a011768bc4ee3bf1248714acc517ee9b393d gencode/python/udmi/schema/state_pointset.py
837ecc89c477abe3a1faf837733ca05475774891b55353d84ca231d90a1fbf31 gencode/python/udmi/schema/state_pointset_point.py
c7e5245ac7fb8a17691e8bd5b71ff47b6b586f33b01e5c0150706598ee58aed5 gencode/python/udmi/schema/state_system.py
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
bin/gencode check
pubber/bin/build check
validator/bin/build check
- name: device ouput logs
- name: device output logs
if: ${{ always() }}
run: more `find udmi_site_model/out/devices/ -type f`
- name: pubber logs
Expand Down
5 changes: 4 additions & 1 deletion bin/loop_sequences
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,15 @@ JAVA_CMD="java -cp $JARFILE com.google.daq.mqtt.validator.SequenceTestRunner"

rm -rf $site_model/out/devices/$device_id

test_srces=`cd validator/src/main/java/com/google/daq/mqtt/validator/validations; ls *.java`

exit_code=2
for test_name in $test_names; do
if [[ $test_name == . ]]; then
test_name=
fi
for test_class in ConfigValidator WritebackValidator; do
for test_src in $test_srces; do
test_class=${test_src%.java}
target=$test_class$test_prefix$test_name
CLASS=com.google.daq.mqtt.validator.validations.$target
echo $JAVA_CMD $CLASS
Expand Down
2 changes: 1 addition & 1 deletion bin/test_schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ fi
echo Testing against $subsets
for subset in $subsets; do
schemaname=${subset%.tests}.json
testfiles=$(cd $testdir/$subset; ls *.json)
testfiles=$(cd $testdir/$subset; ls *.json || true)
for testfile in $testfiles; do
outfile=${testfile%.json}.out
testbase=$testdir/$subset
Expand Down
2 changes: 1 addition & 1 deletion docs/messages/pointset.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Pointset is represented in four locations

## Metadata

- **Schema Definition:** [metadata_pointset.json](../../schema/metadata_pointset.json)
- **Schema Definition:** [model_pointset.json](../../schema/model_pointset.json)
([_🧬View_](../../gencode/docs/metadata.html#pointset))
- [Working `metadata` Example](../../tests/metadata.tests/example.json)

Expand Down
4 changes: 2 additions & 2 deletions docs/messages/system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Primarily used for things like logging, general status, firmware management, etc

## Metadata

- **Schema Definition:** [metadata_system.json](../../schema/metadata_system.json)
- **Schema Definition:** [model_system.json](../../schema/model_system.json)
([_🧬View_](../../gencode/docs/metadata.html#system))
- [Working `metadata` Example](../../tests/metadata.tests/example.json)
- [Working `metadata` Example](../../tests/metadata.tests/example.json)
Loading