@@ -65,7 +65,7 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]"
6565 CloudInt int_test = 123 ;
6666 addPropertyToContainer (property_container, int_test, " test" , Permission::ReadWrite);
6767
68- /* [{0: "test", 3 : 123}] = 9F A2 00 64 74 65 73 74 02 18 7B FF */
68+ /* [{0: "test", 2 : 123}] = 9F A2 00 64 74 65 73 74 02 18 7B FF */
6969 std::vector<uint8_t > const expected = {0x9F , 0xA2 , 0x00 , 0x64 , 0x74 , 0x65 , 0x73 , 0x74 , 0x02 , 0x18 , 0x7B , 0xFF };
7070 std::vector<uint8_t > const actual = cbor::encode (property_container);
7171 REQUIRE (actual == expected);
@@ -114,7 +114,7 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]"
114114 CloudLocation location_test = CloudLocation (2 .0f , 3 .0f );
115115 addPropertyToContainer (property_container, location_test, " test" , Permission::ReadWrite);
116116
117- /* [{0: "test:lat", 3 : 2},{0: "test:lon", 3 : 3}] = 9F A2 00 68 74 65 73 74 3A 6C 61 74 02 FA 40 00 00 00 A2 00 68 74 65 73 74 3A 6C 6F 6E 02 FA 40 40 00 00 FF*/
117+ /* [{0: "test:lat", 2 : 2},{0: "test:lon", 2 : 3}] = 9F A2 00 68 74 65 73 74 3A 6C 61 74 02 FA 40 00 00 00 A2 00 68 74 65 73 74 3A 6C 6F 6E 02 FA 40 40 00 00 FF*/
118118 std::vector<uint8_t > const expected = { 0x9F , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x6C , 0x61 , 0x74 , 0x02 , 0xFA , 0x40 , 0x00 , 0x00 , 0x00 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x6C , 0x6F , 0x6E , 0x02 , 0xFA , 0x40 , 0x40 , 0x00 , 0x00 , 0xFF };
119119 std::vector<uint8_t > const actual = cbor::encode (property_container);
120120 REQUIRE (actual == expected);
@@ -164,7 +164,7 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]"
164164 CloudColoredLight color_test = CloudColoredLight (true , 2.0 , 2.0 , 2.0 );
165165 addPropertyToContainer (property_container, color_test, " test" , Permission::ReadWrite);
166166
167- /* [{0: "test:swi", 4: true},{0: "test:hue", 2: 2.0},{0: "test:sat", 2: 2.0},{0: "test:bri", 2: 2.0}] = 83 A2 00 68 74 65 73 74 3A 73 77 69 04 F5 // A2 00 68 74 65 73 74 3A 68 75 65 02 FA 40 00 00 00 A2 00 68 74 65 73 74 3A 73 61 74 02 FA 40 00 00 00 A2 00 68 74 65 73 74 3A 62 72 69 02 FA 40 00 00 00 FF*/
167+ /* [{0: "test:swi", 4: true},{0: "test:hue", 2: 2.0},{0: "test:sat", 2: 2.0},{0: "test:bri", 2: 2.0}] = 9F A2 00 68 74 65 73 74 3A 73 77 69 04 F5 A2 00 68 74 65 73 74 3A 68 75 65 02 FA 40 00 00 00 A2 00 68 74 65 73 74 3A 73 61 74 02 FA 40 00 00 00 A2 00 68 74 65 73 74 3A 62 72 69 02 FA 40 00 00 00 FF*/
168168 std::vector<uint8_t > const expected = {0x9F , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x73 , 0x77 , 0x69 , 0x04 , 0xF5 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x68 , 0x75 , 0x65 , 0x02 , 0xFA , 0x40 , 0x00 , 0x00 , 0x00 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x73 , 0x61 , 0x74 , 0x02 , 0xFA , 0x40 , 0x00 , 0x00 , 0x00 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x62 , 0x72 , 0x69 , 0x02 , 0xFA , 0x40 , 0x00 , 0x00 , 0x00 , 0xFF };
169169 std::vector<uint8_t > const actual = cbor::encode (property_container);
170170 REQUIRE (actual == expected);
@@ -180,7 +180,7 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]"
180180 CloudTelevision tv_test = CloudTelevision (true , 50 , false , PlaybackCommands::Play, InputValue::TV, 7 );
181181 addPropertyToContainer (property_container, tv_test, " test" , Permission::ReadWrite);
182182
183- /* [{0: "test:swi", 4: true},{0: "test:vol", 2: 50},{0: "test:mut", 2 : false},{0: "test:pbc", 2: 3},{0: "test:inp", 2: 55},{0: "test:cha", 2: 7}] = 9F A2 00 68 74 65 73 74 3A 73 77 69 04 F5 A2 00 68 74 65 73 74 3A 76 6F 6C 02 18 32 A2 00 68 74 65 73 74 3A 6D 75 74 04 F4 A2 00 68 74 65 73 74 3A 70 62 63 02 03 A2 00 68 74 65 73 74 3A 69 6E 70 02 18 37 A2 00 68 74 65 73 74 3A 63 68 61 02 07 FF */
183+ /* [{0: "test:swi", 4: true},{0: "test:vol", 2: 50},{0: "test:mut", 4 : false},{0: "test:pbc", 2: 3},{0: "test:inp", 2: 55},{0: "test:cha", 2: 7}] = 9F A2 00 68 74 65 73 74 3A 73 77 69 04 F5 A2 00 68 74 65 73 74 3A 76 6F 6C 02 18 32 A2 00 68 74 65 73 74 3A 6D 75 74 04 F4 A2 00 68 74 65 73 74 3A 70 62 63 02 03 A2 00 68 74 65 73 74 3A 69 6E 70 02 18 37 A2 00 68 74 65 73 74 3A 63 68 61 02 07 FF */
184184 std::vector<uint8_t > const expected = {0x9F , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x73 , 0x77 , 0x69 , 0x04 , 0xF5 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x76 , 0x6F , 0x6C , 0x02 , 0x18 , 0x32 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x6D , 0x75 , 0x74 , 0x04 , 0xF4 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x70 , 0x62 , 0x63 , 0x02 , 0x03 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x69 , 0x6E , 0x70 , 0x02 , 0x18 , 0x37 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x63 , 0x68 , 0x61 , 0x02 , 0x07 , 0xFF };
185185 std::vector<uint8_t > const actual = cbor::encode (property_container);
186186 REQUIRE (actual == expected);
@@ -196,7 +196,7 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]"
196196 CloudDimmedLight color_test = CloudDimmedLight (true , 2.0 );
197197 addPropertyToContainer (property_container, color_test, " test" , Permission::ReadWrite);
198198
199- /* [{0: "test:swi", 4: true},{0: "test:hue", 2: 0.0},{0: "test:sat", 2: 0.0},{0: "test:bri", 2: 2.0}] = 83 A2 00 68 74 65 73 74 3A 73 77 69 04 F5 // A2 00 68 74 65 73 74 3A 68 75 65 02 FA 00 00 00 00 A2 00 68 74 65 73 74 3A 73 61 74 02 FA 00 00 00 00 A2 00 68 74 65 73 74 3A 62 72 69 02 FA 40 00 00 00 FF*/
199+ /* [{0: "test:swi", 4: true},{0: "test:hue", 2: 0.0},{0: "test:sat", 2: 0.0},{0: "test:bri", 2: 2.0}] = 9F A2 00 68 74 65 73 74 3A 73 77 69 04 F5 A2 00 68 74 65 73 74 3A 68 75 65 02 FA 00 00 00 00 A2 00 68 74 65 73 74 3A 73 61 74 02 FA 00 00 00 00 A2 00 68 74 65 73 74 3A 62 72 69 02 FA 40 00 00 00 FF*/
200200 std::vector<uint8_t > const expected = {0x9F , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x73 , 0x77 , 0x69 , 0x04 , 0xF5 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x68 , 0x75 , 0x65 , 0x02 , 0xFA , 0x00 , 0x00 , 0x00 , 0x00 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x73 , 0x61 , 0x74 , 0x02 , 0xFA , 0x00 , 0x00 , 0x00 , 0x00 , 0xA2 , 0x00 , 0x68 , 0x74 , 0x65 , 0x73 , 0x74 , 0x3A , 0x62 , 0x72 , 0x69 , 0x02 , 0xFA , 0x40 , 0x00 , 0x00 , 0x00 , 0xFF };
201201 std::vector<uint8_t > const actual = cbor::encode (property_container);
202202 REQUIRE (actual == expected);
0 commit comments