Update tests

test/test_colors.tavern.yaml

@@ -63,12 +63,12 @@ marks:
         - ["purple", "#830083", 131, 0, 131, 32784]
         - ["salmon", "#ff8173", 255, 129, 115, 64526]
         - ["sienna", "#a45029", 164, 80, 41, 41605]
-        - ["silver", "#c5c2c5", 197, 194, 197, 50712]
         - ["tomato", "#ff6141", 255, 97, 65, 64264]
         - ["violet", "#ee81ee", 238, 129, 238, 60445]
         - ["yellow", "#ffff00", 255, 255, 0, 65504]
         - ["fuchsia", "#ff00ff", 255, 0, 255, 63519]
         - ["magenta", "#ff00ff", 255, 0, 255, 63519]
+        - ["silver", "#c5c2c5", 197, 194, 197, 50712]
 
   - parametrize:
       key: obj

test/test_obj.tavern.yaml

@@ -242,3 +242,13 @@ stages:
       json:
         value_str: "{str1}{str2}"
       timeout: 1
+
+  - name: Get obj type
+    mqtt_publish:
+      topic: hasp/{plate}/command
+      payload: "p1b1.obj"
+    mqtt_response:
+      topic: hasp/{plate}/state/p1b1
+      json:
+        obj: "{obj}"
+      timeout: 1

test/test_value_str.tavern.yaml

@@ -19,26 +19,27 @@ paho-mqtt:
 
 marks:
   - parametrize:
-      key: objid
+      key: obj
       vals:
-        - 10
-        - 12
-        - 20
-        - 22
-        - 30
-        - 31
-        - 32
-        #        - 33
-        #        - 40
-        - 41
-        - 50
-        - 51
-        - 91
-        #        - 90
-        #        - 1
-        - 2
-        - 71
-        - 80
+        - cpicker
+        - table
+        - tabview
+        - chart
+        - gauge
+        - btn
+        - label
+        - slider
+        - checkbox
+        - switch
+        - bar
+        - arc
+        - led
+        - obj
+        - lmeter
+        - dropdown
+        - spinner
+        - roller
+        - btnmatrix
 
   - parametrize:
       key: str1
@@ -51,8 +52,6 @@ marks:
         - "She opened the door."
         - "Aaron made a picture."
         - "I'm sorry."
-        - Test
-        - ABC
         - huey
         - dewey
         - ""
@@ -61,7 +60,6 @@ marks:
       key: str2
       vals:
         - louie
-        - fred
         - " I danced."
         - " Oak is strong and also gives shade."
         - " Cats and dogs each hate the other."
@@ -90,17 +88,19 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command/jsonl
       json:
-        objid: "{objid}"
+        obj: "{obj}"
         id: 1
-        x: 128
-        y: 128
+        x: 0
+        y: 0
+        w: 240
+        h: 240
     delay_after: 0
 
   - name: Set value_str
     mqtt_publish:
       topic: "hasp/{plate}/command/p[1].b[1].value_str"
       payload: "{str1}{str2}"
-    delay_after: 0.05
+    delay_after: 0
   - name: Get value_str
     mqtt_publish:
       topic: hasp/{plate}/command