Fix test to use pid from json

Author: cecille

src/app/tests/suites/credentials/TestHarnessDACProvider.cpp

@@ -177,6 +177,10 @@ bool ReadValue(Json::Value jsonValue)
     return false;
 }
 
+uint16_t ReadUint16(Json::Value jsonValue){
+    return static_cast<uint16_t>(jsonValue.asUInt());
+}
+
 // TODO: This should be moved to a method of P256Keypair
 CHIP_ERROR LoadKeypairFromRaw(ByteSpan private_key, ByteSpan public_key, Crypto::P256Keypair & keypair)
 {
@@ -205,6 +209,7 @@ void TestHarnessDACProvider::Init(const char * filepath)
     static constexpr char kFirmwareInfoKey[] = "firmware_information";
     static constexpr char kIsSuccessKey[]    = "is_success_case";
     static constexpr char kDescription[]     = "description";
+    static constexpr char kPid[]             = "basic_info_pid";
 
     std::ifstream json(filepath, std::ifstream::binary);
     if (!json)
@@ -272,6 +277,11 @@ void TestHarnessDACProvider::Init(const char * filepath)
         data.description.SetValue(ReadValue(root[kDescription], buf, sizeof(buf)));
     }
 
+    if (root.isMember(kPid))
+    {
+        data.pid.SetValue(ReadUint16(root[kPid]));
+    }
+
     Init(data);
 }
 
@@ -288,6 +298,8 @@ void TestHarnessDACProvider::Init(const TestHarnessDACProviderData & data)
 
     // TODO: We need a real example FirmwareInformation to be populated.
     mFirmwareInformation = data.firmwareInformation.HasValue() ? data.firmwareInformation.Value() : ByteSpan();
+
+    mPid = data.pid.ValueOr(0x8000);
 }
 
 CHIP_ERROR TestHarnessDACProvider::GetDeviceAttestationCert(MutableByteSpan & out_dac_buffer)

src/app/tests/suites/credentials/TestHarnessDACProvider.h

@@ -33,6 +33,7 @@ struct TestHarnessDACProviderData
     chip::Optional<ByteSpan> firmwareInformation;
     chip::Optional<CharSpan> description;
     chip::Optional<bool> isSuccessCase;
+    chip::Optional<uint16_t> pid;
 };
 
 class TestHarnessDACProvider : public DeviceAttestationCredentialsProvider
@@ -47,6 +48,7 @@ class TestHarnessDACProvider : public DeviceAttestationCredentialsProvider
     CHIP_ERROR SignWithDeviceAttestationKey(const ByteSpan & message_to_sign, MutableByteSpan & out_signature_buffer) override;
     CharSpan GetDescription() { return mDescription; }
     bool IsSuccessCase() { return mIsSuccessCase; }
+    uint16_t GetPid() { return mPid; }
 
     void Init(const char * filepath);
     void Init(const TestHarnessDACProviderData & data);
@@ -60,6 +62,7 @@ class TestHarnessDACProvider : public DeviceAttestationCredentialsProvider
     ByteSpan mFirmwareInformation;
     CharSpan mDescription;
     bool mIsSuccessCase;
+    uint16_t mPid;
 };
 
 } // namespace Examples

src/credentials/tests/TestCommissionerDUTVectors.cpp

@@ -108,7 +108,7 @@ TEST_F(TestCommissionerDUTVectors, TestCommissionerDUTVectors)
         Crypto::DRBG_get_bytes(attestationNonceBuf, sizeof(attestationNonceBuf));
 
         VendorId vid = TestVendor1;
-        uint16_t pid = strstr(entry->d_name, "_vidpid_fallback_encoding_") ? 0x00B1 : 0x8000;
+        uint16_t pid = dacProvider.GetPid();
 
         EXPECT_EQ(dacProvider.GetCertificationDeclaration(certDeclSpan), CHIP_NO_ERROR);
         EXPECT_EQ(dacProvider.GetDeviceAttestationCert(dacCertSpan), CHIP_NO_ERROR);