diff --git a/src/lib/asn1/tests/BUILD.gn b/src/lib/asn1/tests/BUILD.gn index 3439eedde3a759..83c3ec8d3d9e43 100644 --- a/src/lib/asn1/tests/BUILD.gn +++ b/src/lib/asn1/tests/BUILD.gn @@ -14,11 +14,10 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/nlunit_test.gni") import("${chip_root}/build/chip/chip_test_suite.gni") -chip_test_suite_using_nltest("tests") { +chip_test_suite("tests") { output_name = "libASN1Tests" test_sources = [ "TestASN1.cpp" ] @@ -26,9 +25,7 @@ chip_test_suite_using_nltest("tests") { public_deps = [ "${chip_root}/src/lib/asn1", "${chip_root}/src/lib/core", - "${chip_root}/src/lib/support:testing_nlunit", "${chip_root}/src/platform", - "${nlunit_test_root}:nlunit-test", ] cflags = [ "-Wconversion" ] diff --git a/src/lib/asn1/tests/TestASN1.cpp b/src/lib/asn1/tests/TestASN1.cpp index 56899892abcc61..db8b1ae8ccf595 100644 --- a/src/lib/asn1/tests/TestASN1.cpp +++ b/src/lib/asn1/tests/TestASN1.cpp @@ -24,7 +24,7 @@ * decode interfaces. * */ -#include +#include #include #include @@ -33,7 +33,6 @@ #include #include #include -#include using namespace chip; using namespace chip::ASN1; @@ -159,7 +158,7 @@ static CHIP_ERROR EncodeASN1TestData(ASN1Writer & writer) return err; } -static void TestASN1_Encode(nlTestSuite * inSuite, void * inContext) +TEST(TestASN1, Encode) { CHIP_ERROR err; static uint8_t buf[2048]; @@ -169,11 +168,11 @@ static void TestASN1_Encode(nlTestSuite * inSuite, void * inContext) writer.Init(buf); err = EncodeASN1TestData(writer); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); encodedLen = writer.GetLengthWritten(); - NL_TEST_ASSERT(inSuite, encodedLen == sizeof(TestASN1_EncodedData)); - NL_TEST_ASSERT(inSuite, memcmp(buf, TestASN1_EncodedData, sizeof(TestASN1_EncodedData)) == 0); + EXPECT_EQ(encodedLen, sizeof(TestASN1_EncodedData)); + EXPECT_EQ(memcmp(buf, TestASN1_EncodedData, sizeof(TestASN1_EncodedData)), 0); #define DUMP_HEX 0 #if DUMP_HEX @@ -187,7 +186,7 @@ static void TestASN1_Encode(nlTestSuite * inSuite, void * inContext) #endif } -static void TestASN1_Decode(nlTestSuite * inSuite, void * inContext) +TEST(TestASN1, Decode) { CHIP_ERROR err = CHIP_NO_ERROR; ASN1Reader reader; @@ -201,17 +200,17 @@ static void TestASN1_Decode(nlTestSuite * inSuite, void * inContext) ASN1_PARSE_ENTER_SEQUENCE { ASN1_PARSE_BOOLEAN(boolVal); - NL_TEST_ASSERT(inSuite, boolVal == kTestVal_01_Bool); + EXPECT_EQ(boolVal, kTestVal_01_Bool); ASN1_PARSE_BOOLEAN(boolVal); - NL_TEST_ASSERT(inSuite, boolVal == kTestVal_02_Bool); + EXPECT_EQ(boolVal, kTestVal_02_Bool); ASN1_PARSE_ENTER_SET {} ASN1_EXIT_SET; ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_03_BitString); + EXPECT_EQ(bitStringVal, kTestVal_03_BitString); ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_04_BitString); + EXPECT_EQ(bitStringVal, kTestVal_04_BitString); ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_05_BitString); + EXPECT_EQ(bitStringVal, kTestVal_05_BitString); ASN1_PARSE_ENTER_SEQUENCE { ASN1_PARSE_ENTER_SEQUENCE @@ -219,65 +218,65 @@ static void TestASN1_Decode(nlTestSuite * inSuite, void * inContext) ASN1_PARSE_ENTER_SEQUENCE { ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_06_BitString); + EXPECT_EQ(bitStringVal, kTestVal_06_BitString); ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_07_BitString); + EXPECT_EQ(bitStringVal, kTestVal_07_BitString); } ASN1_EXIT_SEQUENCE; ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_08_BitString); + EXPECT_EQ(bitStringVal, kTestVal_08_BitString); } ASN1_EXIT_SEQUENCE; ASN1_PARSE_BIT_STRING(bitStringVal); - NL_TEST_ASSERT(inSuite, bitStringVal == kTestVal_09_BitString); + EXPECT_EQ(bitStringVal, kTestVal_09_BitString); } ASN1_EXIT_SEQUENCE; ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_10_Int); + EXPECT_EQ(intVal, kTestVal_10_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_11_Int); + EXPECT_EQ(intVal, kTestVal_11_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_12_Int); + EXPECT_EQ(intVal, kTestVal_12_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_13_Int); + EXPECT_EQ(intVal, kTestVal_13_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_14_Int); + EXPECT_EQ(intVal, kTestVal_14_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_15_Int); + EXPECT_EQ(intVal, kTestVal_15_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_16_Int); + EXPECT_EQ(intVal, kTestVal_16_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_17_Int); + EXPECT_EQ(intVal, kTestVal_17_Int); ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_18_Int); + EXPECT_EQ(intVal, kTestVal_18_Int); ASN1_PARSE_OBJECT_ID(oidVal); - NL_TEST_ASSERT(inSuite, oidVal == kTestVal_19_OID); + EXPECT_EQ(oidVal, kTestVal_19_OID); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_OctetString); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(kTestVal_20_OctetString)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), kTestVal_20_OctetString, sizeof(kTestVal_20_OctetString)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(kTestVal_20_OctetString)); + EXPECT_EQ(memcmp(reader.GetValue(), kTestVal_20_OctetString, sizeof(kTestVal_20_OctetString)), 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_OctetString); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == 1); - NL_TEST_ASSERT(inSuite, reader.GetValue()[0] == kTestVal_20_OctetString[0]); + EXPECT_EQ(reader.GetValueLen(), 1u); + EXPECT_EQ(reader.GetValue()[0], kTestVal_20_OctetString[0]); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_OctetString); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == 0); + EXPECT_EQ(reader.GetValueLen(), 0u); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_GeneralString); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == 0); + EXPECT_EQ(reader.GetValueLen(), 0u); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_PrintableString); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == strlen(kTestVal_21_PrintableString)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), kTestVal_21_PrintableString, strlen(kTestVal_21_PrintableString)) == 0); + EXPECT_EQ(reader.GetValueLen(), strlen(kTestVal_21_PrintableString)); + EXPECT_EQ(memcmp(reader.GetValue(), kTestVal_21_PrintableString, strlen(kTestVal_21_PrintableString)), 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_UTF8String); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == strlen(kTestVal_22_UTFString)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), kTestVal_22_UTFString, strlen(kTestVal_22_UTFString)) == 0); + EXPECT_EQ(reader.GetValueLen(), strlen(kTestVal_22_UTFString)); + EXPECT_EQ(memcmp(reader.GetValue(), kTestVal_22_UTFString, strlen(kTestVal_22_UTFString)), 0); ASN1_PARSE_ENTER_ENCAPSULATED(kASN1TagClass_Universal, kASN1UniversalTag_OctetString) { ASN1_PARSE_ENTER_SEQUENCE { ASN1_PARSE_OBJECT_ID(oidVal); - NL_TEST_ASSERT(inSuite, oidVal == kTestVal_23_OID); + EXPECT_EQ(oidVal, kTestVal_23_OID); ASN1_PARSE_ENTER_ENCAPSULATED(kASN1TagClass_Universal, kASN1UniversalTag_BitString) { ASN1_PARSE_INTEGER(intVal); - NL_TEST_ASSERT(inSuite, intVal == kTestVal_24_Int); + EXPECT_EQ(intVal, kTestVal_24_Int); } ASN1_EXIT_ENCAPSULATED; } @@ -288,10 +287,10 @@ static void TestASN1_Decode(nlTestSuite * inSuite, void * inContext) ASN1_EXIT_SEQUENCE; exit: - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); } -static void TestASN1_NullWriter(nlTestSuite * inSuite, void * inContext) +TEST(TestASN1, NullWriter) { CHIP_ERROR err; ASN1Writer writer; @@ -300,24 +299,24 @@ static void TestASN1_NullWriter(nlTestSuite * inSuite, void * inContext) writer.InitNullWriter(); err = EncodeASN1TestData(writer); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); encodedLen = writer.GetLengthWritten(); - NL_TEST_ASSERT(inSuite, encodedLen == 0); + EXPECT_EQ(encodedLen, 0u); // Methods that take a reader should still read from it, // even if the output is suppressed by the null writer. TLVReader emptyTlvReader; emptyTlvReader.Init(ByteSpan()); err = writer.PutBitString(0, emptyTlvReader); - NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_WRONG_TLV_TYPE); + EXPECT_EQ(err, CHIP_ERROR_WRONG_TLV_TYPE); emptyTlvReader.Init(ByteSpan()); err = writer.PutOctetString(kASN1TagClass_ContextSpecific, 123, emptyTlvReader); - NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_WRONG_TLV_TYPE); + EXPECT_EQ(err, CHIP_ERROR_WRONG_TLV_TYPE); } -static void TestASN1_ASN1UniversalTime(nlTestSuite * inSuite, void * inContext) +TEST(TestASN1, ASN1UniversalTime) { struct ASN1TimeTestCase { @@ -369,16 +368,19 @@ static void TestASN1_ASN1UniversalTime(nlTestSuite * inSuite, void * inContext) CharSpan testStr = CharSpan(testCase.asn1TimeStr, strlen(testCase.asn1TimeStr)); ASN1UniversalTime result; - NL_TEST_ASSERT(inSuite, result.ImportFrom_ASN1_TIME_string(testStr) == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, - result.Year == testCase.asn1Time.Year && result.Month == testCase.asn1Time.Month && - result.Day == testCase.asn1Time.Day && result.Hour == testCase.asn1Time.Hour && - result.Minute == testCase.asn1Time.Minute && result.Second == testCase.asn1Time.Second); + EXPECT_EQ(result.ImportFrom_ASN1_TIME_string(testStr), CHIP_NO_ERROR); + + EXPECT_EQ(result.Year, testCase.asn1Time.Year); + EXPECT_EQ(result.Month, testCase.asn1Time.Month); + EXPECT_EQ(result.Day, testCase.asn1Time.Day); + EXPECT_EQ(result.Hour, testCase.asn1Time.Hour); + EXPECT_EQ(result.Minute, testCase.asn1Time.Minute); + EXPECT_EQ(result.Second, testCase.asn1Time.Second); char buf[ASN1UniversalTime::kASN1TimeStringMaxLength]; MutableCharSpan resultTimeStr(buf); - NL_TEST_ASSERT(inSuite, result.ExportTo_ASN1_TIME_string(resultTimeStr) == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, resultTimeStr.data_equal(testStr)); + EXPECT_EQ(result.ExportTo_ASN1_TIME_string(resultTimeStr), CHIP_NO_ERROR); + EXPECT_TRUE(resultTimeStr.data_equal(testStr)); } for (auto & testCase : sASN1TimeErrorTestCases) @@ -386,11 +388,11 @@ static void TestASN1_ASN1UniversalTime(nlTestSuite * inSuite, void * inContext) CharSpan testStr = CharSpan(testCase.asn1TimeStr, strlen(testCase.asn1TimeStr)); ASN1UniversalTime result; - NL_TEST_ASSERT(inSuite, result.ImportFrom_ASN1_TIME_string(testStr) == testCase.mExpectedResult); + EXPECT_EQ(result.ImportFrom_ASN1_TIME_string(testStr), testCase.mExpectedResult); } } -static void TestASN1_ObjectID(nlTestSuite * inSuite, void * inContext) +TEST(TestASN1, ObjectID) { CHIP_ERROR err; static uint8_t buf[2048]; @@ -412,7 +414,7 @@ static void TestASN1_ObjectID(nlTestSuite * inSuite, void * inContext) ASN1_END_SEQUENCE; encodedLen = writer.GetLengthWritten(); - NL_TEST_ASSERT(inSuite, encodedLen > 0); + EXPECT_GT(encodedLen, 0u); reader.Init(buf, encodedLen); @@ -420,41 +422,37 @@ static void TestASN1_ObjectID(nlTestSuite * inSuite, void * inContext) ASN1_PARSE_ENTER_SEQUENCE { ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_ObjectId); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(sOID_AttributeType_ChipNodeId)); - NL_TEST_ASSERT(inSuite, - memcmp(reader.GetValue(), sOID_AttributeType_ChipNodeId, sizeof(sOID_AttributeType_ChipNodeId)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(sOID_AttributeType_ChipNodeId)); + EXPECT_EQ(memcmp(reader.GetValue(), sOID_AttributeType_ChipNodeId, sizeof(sOID_AttributeType_ChipNodeId)), 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_ObjectId); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(sOID_SigAlgo_ECDSAWithSHA256)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), sOID_SigAlgo_ECDSAWithSHA256, sizeof(sOID_SigAlgo_ECDSAWithSHA256)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(sOID_SigAlgo_ECDSAWithSHA256)); + EXPECT_EQ(memcmp(reader.GetValue(), sOID_SigAlgo_ECDSAWithSHA256, sizeof(sOID_SigAlgo_ECDSAWithSHA256)), 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_ObjectId); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(sOID_EllipticCurve_prime256v1)); - NL_TEST_ASSERT(inSuite, - memcmp(reader.GetValue(), sOID_EllipticCurve_prime256v1, sizeof(sOID_EllipticCurve_prime256v1)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(sOID_EllipticCurve_prime256v1)); + EXPECT_EQ(memcmp(reader.GetValue(), sOID_EllipticCurve_prime256v1, sizeof(sOID_EllipticCurve_prime256v1)), 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_ObjectId); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(sOID_Extension_AuthorityKeyIdentifier)); - NL_TEST_ASSERT( - inSuite, - memcmp(reader.GetValue(), sOID_Extension_AuthorityKeyIdentifier, sizeof(sOID_Extension_AuthorityKeyIdentifier)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(sOID_Extension_AuthorityKeyIdentifier)); + EXPECT_EQ(memcmp(reader.GetValue(), sOID_Extension_AuthorityKeyIdentifier, sizeof(sOID_Extension_AuthorityKeyIdentifier)), + 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_ObjectId); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(sOID_Extension_BasicConstraints)); - NL_TEST_ASSERT(inSuite, - memcmp(reader.GetValue(), sOID_Extension_BasicConstraints, sizeof(sOID_Extension_BasicConstraints)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(sOID_Extension_BasicConstraints)); + EXPECT_EQ(memcmp(reader.GetValue(), sOID_Extension_BasicConstraints, sizeof(sOID_Extension_BasicConstraints)), 0); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_ObjectId); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(sOID_KeyPurpose_ServerAuth)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), sOID_KeyPurpose_ServerAuth, sizeof(sOID_KeyPurpose_ServerAuth)) == 0); + EXPECT_EQ(reader.GetValueLen(), sizeof(sOID_KeyPurpose_ServerAuth)); + EXPECT_EQ(memcmp(reader.GetValue(), sOID_KeyPurpose_ServerAuth, sizeof(sOID_KeyPurpose_ServerAuth)), 0); } ASN1_EXIT_SEQUENCE; exit: - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); } -static void TestASN1_FromTLVReader(nlTestSuite * inSuite, void * inContext) +TEST(TestASN1, FromTLVReader) { CHIP_ERROR err; static uint8_t tlvBuf[128]; @@ -474,23 +472,23 @@ static void TestASN1_FromTLVReader(nlTestSuite * inSuite, void * inContext) tlvWriter.Init(tlvEncodedData); err = tlvWriter.StartContainer(AnonymousTag(), kTLVType_Structure, outerContainerType); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvWriter.PutBytes(TLV::ContextTag(1), kTestVal_20_OctetString, sizeof(kTestVal_20_OctetString)); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvWriter.PutBytes(TLV::ContextTag(2), kTestVal_09_BitString_AsOctetString, sizeof(kTestVal_09_BitString_AsOctetString)); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvWriter.PutString(TLV::ContextTag(3), kTestVal_21_PrintableString); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvWriter.EndContainer(outerContainerType); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvWriter.Finalize(); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); } // Construct first ASN1 SEQUESNCE using values. @@ -504,7 +502,7 @@ static void TestASN1_FromTLVReader(nlTestSuite * inSuite, void * inContext) err = writer.PutValue(kASN1TagClass_Universal, kASN1UniversalTag_PrintableString, false, reinterpret_cast(kTestVal_21_PrintableString), static_cast(strlen(kTestVal_21_PrintableString))); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); } ASN1_END_SEQUENCE; asn1EncodedData1.reduce_size(writer.GetLengthWritten()); @@ -515,84 +513,58 @@ static void TestASN1_FromTLVReader(nlTestSuite * inSuite, void * inContext) ASN1_START_SEQUENCE { err = tlvReader.Next(kTLVType_Structure, AnonymousTag()); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvReader.EnterContainer(outerContainerType); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvReader.Next(kTLVType_ByteString, ContextTag(1)); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = writer.PutOctetString(kASN1TagClass_Universal, kASN1UniversalTag_OctetString, tlvReader); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvReader.Next(kTLVType_ByteString, ContextTag(2)); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = writer.PutBitString(6, tlvReader); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvReader.Next(kTLVType_UTF8String, ContextTag(3)); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = writer.PutValue(kASN1TagClass_Universal, kASN1UniversalTag_PrintableString, false, tlvReader); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); err = tlvReader.ExitContainer(outerContainerType); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); } ASN1_END_SEQUENCE; asn1EncodedData2.reduce_size(writer.GetLengthWritten()); // Compare two ASN1 SEQUENCEs. - NL_TEST_ASSERT(inSuite, asn1EncodedData2.data_equal(asn1EncodedData1)); + EXPECT_TRUE(asn1EncodedData2.data_equal(asn1EncodedData1)); // Initialize ASN1Reader and test data. reader.Init(asn1EncodedData2); ASN1_PARSE_ENTER_SEQUENCE { ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_OctetString); - NL_TEST_ASSERT(inSuite, reader.GetValue() != nullptr); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == sizeof(kTestVal_20_OctetString)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), kTestVal_20_OctetString, sizeof(kTestVal_20_OctetString)) == 0); + ASSERT_NE(reader.GetValue(), nullptr); + EXPECT_EQ(reader.GetValueLen(), sizeof(kTestVal_20_OctetString)); + EXPECT_EQ(memcmp(reader.GetValue(), kTestVal_20_OctetString, sizeof(kTestVal_20_OctetString)), 0); uint32_t val; ASN1_PARSE_BIT_STRING(val); - NL_TEST_ASSERT(inSuite, val == kTestVal_09_BitString); + EXPECT_EQ(val, kTestVal_09_BitString); ASN1_PARSE_ELEMENT(kASN1TagClass_Universal, kASN1UniversalTag_PrintableString); - NL_TEST_ASSERT(inSuite, reader.GetValue() != nullptr); - NL_TEST_ASSERT(inSuite, reader.GetValueLen() == strlen(kTestVal_21_PrintableString)); - NL_TEST_ASSERT(inSuite, memcmp(reader.GetValue(), kTestVal_21_PrintableString, strlen(kTestVal_21_PrintableString)) == 0); + ASSERT_NE(reader.GetValue(), nullptr); + EXPECT_EQ(reader.GetValueLen(), strlen(kTestVal_21_PrintableString)); + EXPECT_EQ(memcmp(reader.GetValue(), kTestVal_21_PrintableString, strlen(kTestVal_21_PrintableString)), 0); } ASN1_EXIT_SEQUENCE; exit: - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + EXPECT_EQ(err, CHIP_NO_ERROR); } - -/** - * Test Suite. It lists all the test functions. - */ - -// clang-format off -static const nlTest sTests[] = -{ - NL_TEST_DEF("Test ASN1 encoding macros", TestASN1_Encode), - NL_TEST_DEF("Test ASN1 decoding macros", TestASN1_Decode), - NL_TEST_DEF("Test ASN1 NULL writer", TestASN1_NullWriter), - NL_TEST_DEF("Test ASN1 universal time", TestASN1_ASN1UniversalTime), - NL_TEST_DEF("Test ASN1 Object IDs", TestASN1_ObjectID), - NL_TEST_DEF("Test ASN1 Init with ByteSpan", TestASN1_FromTLVReader), - NL_TEST_SENTINEL() -}; -// clang-format on - -int TestASN1() -{ - nlTestSuite theSuite = { "Support-ASN1", &sTests[0], nullptr, nullptr }; - nlTestRunner(&theSuite, nullptr); - return (nlTestRunnerStats(&theSuite)); -} - -CHIP_REGISTER_TEST_SUITE(TestASN1); diff --git a/src/test_driver/openiotsdk/unit-tests/test_components.txt b/src/test_driver/openiotsdk/unit-tests/test_components.txt index bc9d77e48d075f..52b078060ab1de 100644 --- a/src/test_driver/openiotsdk/unit-tests/test_components.txt +++ b/src/test_driver/openiotsdk/unit-tests/test_components.txt @@ -1,2 +1,3 @@ accesstest +ASN1Tests PlatformTests diff --git a/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt b/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt index 0e012ff3354f02..6e588d9241a716 100644 --- a/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt +++ b/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt @@ -1,5 +1,4 @@ AppTests -ASN1Tests BDXTests ChipCryptoTests CoreTests