Skip to content

Commit 64d25e8

Browse files
committed
credentials to pigweed
1 parent 742e65b commit 64d25e8

11 files changed

+2573
-3155
lines changed

src/credentials/tests/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
17-
import("//build_overrides/nlunit_test.gni")
1817

1918
import("${chip_root}/build/chip/chip_test_suite.gni")
2019
import("${chip_root}/build/chip/fuzz_test.gni")
@@ -42,7 +41,7 @@ static_library("cert_test_vectors") {
4241
]
4342
}
4443

45-
chip_test_suite_using_nltest("tests") {
44+
chip_test_suite("tests") {
4645
output_name = "libCredentialsTest"
4746
output_dir = "${root_out_dir}/lib"
4847

@@ -71,8 +70,6 @@ chip_test_suite_using_nltest("tests") {
7170
"${chip_root}/src/credentials:default_attestation_verifier",
7271
"${chip_root}/src/lib/core",
7372
"${chip_root}/src/lib/support:testing",
74-
"${chip_root}/src/lib/support:testing_nlunit",
75-
"${nlunit_test_root}:nlunit-test",
7673
]
7774
}
7875

src/credentials/tests/TestCertificationDeclaration.cpp

+119-156
Large diffs are not rendered by default.

src/credentials/tests/TestChipCert.cpp

+422-513
Large diffs are not rendered by default.

src/credentials/tests/TestCommissionerDUTVectors.cpp

+21-68
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
#include <lib/core/CHIPError.h>
3030
#include <lib/support/CHIPMem.h>
3131
#include <lib/support/Span.h>
32-
#include <lib/support/UnitTestExtendedAssertions.h>
33-
#include <lib/support/UnitTestRegistration.h>
3432

35-
#include <nlunit-test.h>
33+
#include <gtest/gtest.h>
3634

3735
#include <dirent.h>
3836
#include <stdio.h>
@@ -49,10 +47,17 @@ static void OnAttestationInformationVerificationCallback(void * context, const D
4947
*pResult = result;
5048
}
5149

52-
static void TestCommissionerDUTVectors(nlTestSuite * inSuite, void * inContext)
50+
struct TestCommissionerDUTVectors : public ::testing::Test
51+
{
52+
static void SetUpTestSuite() { ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR); }
53+
54+
static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
55+
};
56+
57+
TEST_F(TestCommissionerDUTVectors, TestCommissionerDUTVectors)
5358
{
5459
DeviceAttestationVerifier * example_dac_verifier = GetDefaultDACVerifier(GetTestAttestationTrustStore());
55-
NL_TEST_ASSERT(inSuite, example_dac_verifier != nullptr);
60+
ASSERT_NE(example_dac_verifier, nullptr);
5661

5762
std::string dirPath("../../../../../credentials/development/commissioner_dut/");
5863
DIR * dir = opendir(dirPath.c_str());
@@ -105,14 +110,14 @@ static void TestCommissionerDUTVectors(nlTestSuite * inSuite, void * inContext)
105110
VendorId vid = TestVendor1;
106111
uint16_t pid = strstr(entry->d_name, "_vidpid_fallback_encoding_") ? 0x00B1 : 0x8000;
107112

108-
NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.GetCertificationDeclaration(certDeclSpan));
109-
NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.GetDeviceAttestationCert(dacCertSpan));
110-
NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.GetProductAttestationIntermediateCert(paiCertSpan));
113+
EXPECT_EQ(dacProvider.GetCertificationDeclaration(certDeclSpan), CHIP_NO_ERROR);
114+
EXPECT_EQ(dacProvider.GetDeviceAttestationCert(dacCertSpan), CHIP_NO_ERROR);
115+
EXPECT_EQ(dacProvider.GetProductAttestationIntermediateCert(paiCertSpan), CHIP_NO_ERROR);
111116

112117
size_t attestationElementsLen =
113118
TLV::EstimateStructOverhead(certDeclSpan.size(), attestationNonceSpan.size(), sizeof(uint64_t) * 8);
114119
Platform::ScopedMemoryBuffer<uint8_t> attestationElements;
115-
NL_TEST_ASSERT(inSuite, attestationElements.Alloc(attestationElementsLen + attestationChallengeSpan.size()));
120+
EXPECT_TRUE(attestationElements.Alloc(attestationElementsLen + attestationChallengeSpan.size()));
116121
MutableByteSpan attestationElementsSpan(attestationElements.Get(), attestationElementsLen);
117122

118123
// Construct attestation elements
@@ -121,10 +126,9 @@ static void TestCommissionerDUTVectors(nlTestSuite * inSuite, void * inContext)
121126
Credentials::DeviceAttestationVendorReservedConstructor emptyVendorReserved(nullptr, 0);
122127
const ByteSpan kEmptyFirmwareInfo;
123128

124-
NL_TEST_ASSERT_SUCCESS(inSuite,
125-
Credentials::ConstructAttestationElements(certDeclSpan, attestationNonceSpan, timestamp,
126-
kEmptyFirmwareInfo, emptyVendorReserved,
127-
attestationElementsSpan));
129+
EXPECT_EQ(Credentials::ConstructAttestationElements(certDeclSpan, attestationNonceSpan, timestamp, kEmptyFirmwareInfo,
130+
emptyVendorReserved, attestationElementsSpan),
131+
CHIP_NO_ERROR);
128132
}
129133

130134
// Generate attestation signature
@@ -134,8 +138,8 @@ static void TestCommissionerDUTVectors(nlTestSuite * inSuite, void * inContext)
134138
attestationChallengeSpan.size());
135139
ByteSpan tbsSpan(attestationElementsSpan.data(), attestationElementsSpan.size() + attestationChallengeSpan.size());
136140

137-
NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.SignWithDeviceAttestationKey(tbsSpan, attestationSignatureSpan));
138-
NL_TEST_ASSERT(inSuite, attestationSignatureSpan.size() == signature.Capacity());
141+
EXPECT_EQ(dacProvider.SignWithDeviceAttestationKey(tbsSpan, attestationSignatureSpan), CHIP_NO_ERROR);
142+
EXPECT_EQ(attestationSignatureSpan.size(), signature.Capacity());
139143
}
140144

141145
AttestationVerificationResult attestationResult = AttestationVerificationResult::kNotImplemented;
@@ -167,63 +171,12 @@ static void TestCommissionerDUTVectors(nlTestSuite * inSuite, void * inContext)
167171

168172
if (isSuccessCase)
169173
{
170-
NL_TEST_ASSERT(inSuite, attestationResult == AttestationVerificationResult::kSuccess);
174+
EXPECT_EQ(attestationResult, AttestationVerificationResult::kSuccess);
171175
}
172176
else
173177
{
174-
NL_TEST_ASSERT(inSuite, attestationResult != AttestationVerificationResult::kSuccess);
178+
EXPECT_NE(attestationResult, AttestationVerificationResult::kSuccess);
175179
}
176180
}
177181
closedir(dir);
178182
}
179-
180-
/**
181-
* Set up the test suite.
182-
*/
183-
int TestCommissionerDUT_Setup(void * inContext)
184-
{
185-
CHIP_ERROR error = chip::Platform::MemoryInit();
186-
187-
if (error != CHIP_NO_ERROR)
188-
{
189-
return FAILURE;
190-
}
191-
192-
return SUCCESS;
193-
}
194-
195-
/**
196-
* Tear down the test suite.
197-
*/
198-
int TestCommissionerDUT_Teardown(void * inContext)
199-
{
200-
chip::Platform::MemoryShutdown();
201-
return SUCCESS;
202-
}
203-
204-
/**
205-
* Test Suite. It lists all the test functions.
206-
*/
207-
// clang-format off
208-
static const nlTest sTests[] = {
209-
NL_TEST_DEF("Test Device Attestation Credentials Vectors", TestCommissionerDUTVectors),
210-
NL_TEST_SENTINEL()
211-
};
212-
// clang-format on
213-
214-
int TestCommissionerDUT()
215-
{
216-
// clang-format off
217-
nlTestSuite theSuite =
218-
{
219-
"Device Attestation Credentials Test Vectors",
220-
&sTests[0],
221-
TestCommissionerDUT_Setup,
222-
TestCommissionerDUT_Teardown
223-
};
224-
// clang-format on
225-
nlTestRunner(&theSuite, nullptr);
226-
return (nlTestRunnerStats(&theSuite));
227-
}
228-
229-
CHIP_REGISTER_TEST_SUITE(TestCommissionerDUT);

0 commit comments

Comments
 (0)