Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-definition-for-service-area-cluster

Author: hicklin

.github/workflows/examples-mbed.yaml

@@ -158,7 +158,8 @@ jobs:
                   rm -rf ./out
 
             - name: Build unit tests
-              # Temporarily disable build due to running out of flash space
+              # Temporarily disabled build due to running out of flash space
+              # TODO Issue #33978: re-enable unit testing after split of unit tests is done
               if: false
               run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
 

.github/workflows/tests.yaml

@@ -133,6 +133,14 @@ groups:
             teams: [reviewers-google]
         reviews:
             request: 10
+    shared-reviewers-grundfos:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-grundfos]
+        reviews:
+            request: 10
     shared-reviewers-irobot:
         type: optional
         conditions:

.pullapprove.yml

@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/mbedtls.gni")
 import("//build_overrides/nlassert.gni")
-import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
 import("//src/lwip/lwip.gni")
@@ -135,7 +134,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       "${chip_root}/src/system",
       "${chip_root}/src/transport",
       "${nlassert_root}:nlassert",
-      "${nlunit_test_root}:nlunit-test",
     ]
 
     if (enable_fuzz_test_targets) {

BUILD.gn

@@ -33,8 +33,8 @@ assert(chip_build_tests)
 #   ]
 #
 #   test_sources = [
-#     "TestFoo.cpp",    # Files are parsed for `CHIP_REGISTER_TEST_SUITE(...)`
-#     "TestBar.cpp",    # and a driver is created automatically
+#     "TestFoo.cpp",
+#     "TestBar.cpp",
 #   ]
 #
 #   public_deps = [
@@ -175,100 +175,3 @@ template("chip_test_suite") {
     }
   }
 }
-
-# TODO [PW_MIGRATION]: remove this once transition away from nlunit-test is completed
-template("chip_test_suite_using_nltest") {
-  _suite_name = target_name
-
-  # Ensures that the common library has sources containing both common
-  # and individual unit tests.
-  if (!defined(invoker.sources)) {
-    invoker.sources = []
-  }
-
-  if (defined(invoker.test_sources)) {
-    invoker.sources += invoker.test_sources
-  }
-
-  if (chip_build_test_static_libraries) {
-    _target_type = "static_library"
-  } else {
-    _target_type = "source_set"
-  }
-  target(_target_type, "${_suite_name}.lib") {
-    forward_variables_from(invoker, "*", [ "tests" ])
-
-    output_dir = "${root_out_dir}/lib"
-
-    if (!defined(invoker.public_deps)) {
-      public_deps = []
-    }
-
-    if (current_os != "zephyr" && current_os != "mbed") {
-      # Depend on stdio logging, and have it take precedence over the default platform backend
-      public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
-    }
-  }
-  if (chip_link_tests) {
-    tests = []
-
-    if (defined(invoker.test_sources)) {
-      foreach(_test, invoker.test_sources) {
-        _test_name = string_replace(_test, ".cpp", "")
-
-        _driver_name = "${root_gen_dir}/${_test_name}.driver.cpp"
-
-        action("${_test_name}_generate_driver") {
-          script = "${chip_root}/scripts/gen_test_driver.py"
-
-          inputs = [ _test ]
-          outputs = [ _driver_name ]
-          args = [
-            "--input_file=" + rebase_path(_test, root_build_dir),
-            "--output_file=" + rebase_path(_driver_name, root_build_dir),
-          ]
-        }
-
-        chip_test(_test_name) {
-          sources = [ _driver_name ]
-          public_deps = [
-            ":${_suite_name}.lib",
-            ":${_test_name}_generate_driver",
-          ]
-        }
-        tests += [ _test_name ]
-      }
-    }
-
-    if (defined(invoker.tests)) {
-      foreach(_test, invoker.tests) {
-        chip_test(_test) {
-          sources = [ "${_test}Driver.cpp" ]
-
-          public_deps = [ ":${_suite_name}.lib" ]
-        }
-        tests += [ _test ]
-      }
-    }
-
-    group(_suite_name) {
-      deps = []
-      foreach(_test, tests) {
-        deps += [ ":${_test}" ]
-      }
-    }
-
-    if (chip_pw_run_tests) {
-      group("${_suite_name}_run") {
-        deps = []
-        foreach(_test, tests) {
-          deps += [ ":${_test}.run" ]
-        }
-      }
-    }
-  } else {
-    group(_suite_name) {
-      deps = [ ":${_suite_name}.lib" ]
-    }
-  }
-}

build/chip/chip_test_suite.gni

@@ -36,7 +36,6 @@ declare_args() {
 #
 #   public_deps = [
 #     "${chip_root}/src/lib/foo",         # add dependencies here
-#     "${nlunit_test_root}:nlunit-test",
 #   ]
 # }
 #

build/chip/fuzz_test.gni

@@ -1,6 +1,7 @@
 {
     "description": "PAA Test Vector: Use Invalid PAA (Not Registered in the DCL).",
     "is_success_case": "false",
+    "basic_info_pid": 32768,
     "dac_cert": "308201cd30820172a0030201020208567d67fad563292c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c0446464631301e170d3231303632383134323334335a170d3232303632383134323334325a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043e84ccfb667a1d562229015913124f85e7c62d6f1393a21327fb3e4dc4d6e7a425b00dc77250800c07a90311bdf4f70dd85a70ec7689a45a9f063c1bd03508c7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cd5158817cba8798bf2d4c3823403a78b26a6e2c301f0603551d2304183016801460299f6439897e6f486e5f7237cd98a297ad48e1300a06082a8648ce3d040302034900304602210088a0246e9fa3314477108d6ca54be5f085d49280dc443fe36d7142b35fa7661f022100deb66d515b10a85e3da566fcdacfd6809df9969281dc6c18aa3aa397d10596fe",
     "pai_cert": "308201c53082016ba00302010202087a29a4e6ad8c2979300a06082a8648ce3d04030230393137303506035504030c2e496e76616c696420284e6f74205265676973746572656420696e207468652044434c29204d617474657220504141301e170d3231303632383134323334335a170d3232303632383134323334325a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000447262db2383a51c1064c0f19ff281526a8a2d31186f26e4e99435d00ed2d839184dbfa933bb69f5d2efec15558d35306d9245e926f59a69fe3018bb7ca63928fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041460299f6439897e6f486e5f7237cd98a297ad48e1301f0603551d23041830168014135ad5c6f7b95c524f346cbf2e9c124d9fbd4e2d300a06082a8648ce3d0403020348003045022100f9a560954e98b0b3ff621166727664d689a41d3b4cd107c3e87a9145b3384a8a0220586b4ad7f4c2c7c333e9cdfe3d37065d238cb7498e7629e20964e501f4a7beea",
     "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202f6fdf1d3e5587c6e6f4d6f2015b1a2b69a22768efe10bfbbdcc7f7c53e81db202206f4bcc3fead88b2aebb9a1ece815b5f20fee350d96127e77150d9a7b024d073f",

build_overrides/nlunit_test.gni

@@ -1,6 +1,7 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains one valid PAA which is authorized to sign the PAI.",
     "is_success_case": "false",
+    "basic_info_pid": 32768,
     "dac_cert": "308201e53082018aa003020102020866dfbc08976c91be300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000418f3f19bd1c766d85fc6f3f86773b1b3a245c4928fb24b3430294c7d3f43c26866b5aeeac77dbc8ac007195ac0ffa67412e63574a370ec024abeca5f30aa49faa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c154ccb722ff1bc9ed9f91aa597eb1e97039eb1c301f0603551d230418301680140c0527c403c6de10a5fde5c521bbbed4f0f88732300a06082a8648ce3d0403020349003046022100a5598c46a8b9991d5c488030eb6d8e6bbc6959774bac0838064d287cc1cbe485022100bbc7ba9ef547985f4956f8a65bacba7e6ebd6317ead65ef59784894e44d809c0",
     "pai_cert": "308201d53082017aa00302010202085cbff391288347ef300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b360814283520ecb9fb9c405780a2930bc7b833ae4106ab1259fc6d177c54edf5d4725c30e400f542ca865f7f2d74b315e0ff7b438040f75fe1128142c6bc3daa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140c0527c403c6de10a5fde5c521bbbed4f0f88732301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100aba3cf5b385fa705ff1e2b49a067d6140c591797fadfd8815e52918a77b09c430221009434b1902c4306c1300224152cf04f56d353bc6d7953005a5edf9afef94164f7",
     "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b1818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203e95e0d9d4324d9fdbb38d6880285888828427759c03b8763bda4e43953fd290022100e030484f70e8f937175c28d1ce575bd612251a4b1d83a0365a2374c613933487",

credentials/development/commissioner_dut/invalid_paa/test_case_vector.json

@@ -1,6 +1,7 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains ten PAAs none of which is a valid PAA authorized to sign the PAI.",
     "is_success_case": "false",
+    "basic_info_pid": 32768,
     "dac_cert": "308201e43082018aa0030201020208619d97b52a9bd8b5300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000444ee63eae77e514b74f16a0ffc056f5cc7e15b50be36fa820f53c8f9db55f3abf63a2d9e801294ba8856aa3b8a890331068c7e91290069951fc8b7878f689acfa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041483d1ac698457e8200c643f7dac654164e6b0c676301f0603551d230418301680144a5d2c6304ac0c2e83759550647d8d2f45cb2b14300a06082a8648ce3d040302034800304502202484b475e7db3bc35b156fb4d4987fca8522f4ae2ac4029ba2a07441d9e22073022100b68d656f8b07db08086f29d1a26a53b3446767f797bb8b1abef5ef18842ee907",
     "pai_cert": "308201d43082017aa0030201020208079e93d07530dbf4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047a70f9af70bb9bf2b302ecbd0ef86193ebfed1136bb62a9b115792a2b7f9ab0a920ffa8e7ff5f88a4dfbf211c5a0cf08d7265bc3513aabdf22420cdf4918f05ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144a5d2c6304ac0c2e83759550647d8d2f45cb2b14301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100acfd6e9ab1c356e6539f5208e6146627be56f80ced4fb39217e28fb7c23d0f5c0220214b75d6180d62c8d4afd7d32be976b20fcc40c1b362976b5ba65db13a1d9623",
     "certification_declaration": "308201d006092a864886f70d010702a08201c1308201bd020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe662010140bbb3544c5016577aa8b44ffb90fcca140fe662010140bbb35443a016577aa8b44ffb90fcca140fe662010140bbb35443afe6577aa8b44ffb90fcca140fe662010140bbb35443afe9a77aa8b44ffb90fcca140fe662010140bbb35443afe9a88aa8b44ffb90fcca140fe662010140bbb35443afe9a88558b44ffb90fcca140fe662010140bbb35443afe9a88557444ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203d4581e769a71482498f4fe9df315e486ed838951af4aad8fa94dd8ef5bf3c63022100f24ac406238eb617e7a9c18b16938bfd4540a7aa106486d37468fc3b411855e3",

credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json

@@ -1,6 +1,7 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains ten PAAs one of which is valid PAA authorized to sign the PAI.",
     "is_success_case": "true",
+    "basic_info_pid": 32768,
     "dac_cert": "308201e43082018aa0030201020208164c0e740ca45824300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000463aff759bddaee30f45b5b4a486d4f9fb32de4c698720054d3e95333a6d71dfb19e40a04f5c5eb4a535090e102df06e2ae8e02066bc086829f289cc9f3b7915aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414569bc3bd997dc682c1c714157c139710a38776ea301f0603551d2304183016801407a710a0ff13d00df63a9e5c8325174c5f08c8d0300a06082a8648ce3d040302034800304502203a3e6465f2cb66b3a61e2b4a44cf4a4084f4abc76a97471e3ffb444ccf1f3246022100f1e5cb7f071aa52231a4bdaee309ea3372b98875910ea14aedf76ad3f6721bc9",
     "pai_cert": "308201d33082017aa00302010202084feaec9a37c9398e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004142c31ebc29a3d6bb04a18ef2cc6e7648634fdbf9d3bb2c91a53799b9f458456db64372997fe1727ee95e95a2382c0b4066e2df9dbef78829d2b5b6d8e7a2a16a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041407a710a0ff13d00df63a9e5c8325174c5f08c8d0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207e75cabe27de00bb184983ca5443416e7976c1de5f8b8a82df70444373d42cb5022077a43af72e320fc74dc1d76a859d10c700b2ffe5a49ec2d23753f27bd7f19b34",
     "certification_declaration": "308201d006092a864886f70d010702a08201c1308201bd020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201014f4bb35bbc5016577aa8b44ffb90fcca140fe66201014f4bb3544c5016577aa8b44ffb90fcca140fe66201014f4bb35443a016577aa8b44ffb90fcca140fe66201014f4bb35443afe6577aa8b44ffb90fcca140fe66201014f4bb35443afe9a77aa8b44ffb90fcca140fe66201014f4bb35443afe9a88aa8b44ffb90fcca140fe66201014f4bb35443afe9a88558b44ffb90fcca140fe66201014f4bb35443afe9a88557444ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201b10656798c6360de20e30e2ebd93fa776f78eb347bc178b92064470080cd972022100e6c798a2c4dd0486b927c99d40c9a01994fd8f5000037c26e5f2bf5f3492192e",

credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json

@@ -1,6 +1,7 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains one valid PAA which is authorized to sign the PAI.",
     "is_success_case": "true",
+    "basic_info_pid": 32768,
     "dac_cert": "308201e53082018aa00302010202080e5146c5fe47ba0a300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004447eff6c579f3ebb8014886ecd2031ed2b22476986c35d5db3f1516f8335aa785e9e5d5b8b1ba5f0aee3cf3dcd9f84f5431f6bae2a15a207b4a81fb0540a50d0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c54475ec42f837b7b11d186236c6329607c5c23f301f0603551d230418301680140a620b8d9e1b8da6cb6f22b275a464e4b41938b1300a06082a8648ce3d0403020349003046022100dec569252bcde62ff937f3eb5c312c437cc1cad7736b145cc5c55f7e4beb2c0e022100d79dba6ed3b1c3956f6f759f20f1472415d095bef53ab65cba0b3c743d1709a1",
     "pai_cert": "308201d53082017aa00302010202082a474a51bba41ea1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000420fd963ee5c8a978c5b8f2bde7262279bf5517234f93e6dded3c23baf4e53cfb886ad83a82a0791bad434d0d72563815bab9a0a48fbf15489770ce77adabba31a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140a620b8d9e1b8da6cb6f22b275a464e4b41938b1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a859075ac87461eeaade52383d8d404f7f2ed41d0bf3535f22a670c7bf393b73022100e8be368b400f6ac406e03c3a85f93139e06532b23e8547b67ae35099ef40fb48",
     "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100bac36c9f830bcbd49e07dd670d042df0eaa4ae1cf5308d39434fb0e7851402e902210087e279dc232a5eb68c74f19aec946ad988edfc35ac4a420cce36a1ec49c76d50",