Skip to content

Commit 858d870

Browse files
Replaced nlunit-test with pw_unit_test in src/lib/shell/ (#33066)
* Replaced nlunit-test with pw_unit_test in src/lib/shell/ * Restyled by whitespace * Restyled by clang-format * Update openiot test components --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 80b2f61 commit 858d870

File tree

5 files changed

+11
-58
lines changed

5 files changed

+11
-58
lines changed

src/lib/shell/tests/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
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

21-
chip_test_suite_using_nltest("tests") {
20+
chip_test_suite("tests") {
2221
output_name = "libTestShell"
2322

2423
test_sources = [
@@ -31,7 +30,5 @@ chip_test_suite_using_nltest("tests") {
3130
public_deps = [
3231
"${chip_root}/src/lib/core",
3332
"${chip_root}/src/lib/shell",
34-
"${chip_root}/src/lib/support:testing_nlunit",
35-
"${nlunit_test_root}:nlunit-test",
3633
]
3734
}

src/lib/shell/tests/TestShellStreamerStdio.cpp

+4-26
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include <nlunit-test.h>
18+
#include <gtest/gtest.h>
1919

2020
#include <lib/shell/Engine.h>
2121
#include <lib/support/CodeUtils.h>
22-
#include <lib/support/UnitTestRegistration.h>
2322

2423
#include <inttypes.h>
2524
#include <stdarg.h>
@@ -48,7 +47,7 @@ static const struct test_streamer_vector test_vector_streamer_out[] = {
4847
// Unit tests
4948
// =================================
5049

51-
static void TestStreamer_Output(nlTestSuite * inSuite, void * inContext)
50+
TEST(TestShellStreamerStdio, TestStreamer_Output)
5251
{
5352
int numOfTestVectors = ArraySize(test_vector_streamer_out);
5453
int numOfTestsRan = 0;
@@ -64,29 +63,8 @@ static void TestStreamer_Output(nlTestSuite * inSuite, void * inContext)
6463

6564
num_chars = streamer_write(streamer_get(), output, strlen(output));
6665
// Let's assume that all our output lengths fit in ssize_t.
67-
NL_TEST_ASSERT(inSuite, num_chars == static_cast<ssize_t>(strlen(output)));
66+
EXPECT_EQ(num_chars, static_cast<ssize_t>(strlen(output)));
6867
numOfTestsRan++;
6968
}
70-
NL_TEST_ASSERT(inSuite, numOfTestsRan > 0);
69+
EXPECT_GT(numOfTestsRan, 0);
7170
}
72-
73-
/**
74-
* Test Suite. It lists all the test functions.
75-
*/
76-
static const nlTest sTests[] = {
77-
78-
NL_TEST_DEF("Test Shell: TestStreamer_Output", TestStreamer_Output),
79-
80-
NL_TEST_SENTINEL()
81-
};
82-
83-
int TestStreamerStdio()
84-
{
85-
nlTestSuite theSuite = { "Test Shell: Streamer", &sTests[0], nullptr, nullptr };
86-
87-
// Run test suite against one context.
88-
nlTestRunner(&theSuite, nullptr);
89-
return nlTestRunnerStats(&theSuite);
90-
}
91-
92-
CHIP_REGISTER_TEST_SUITE(TestStreamerStdio)

src/lib/shell/tests/TestShellTokenizeLine.cpp

+5-27
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include <nlunit-test.h>
18+
#include <gtest/gtest.h>
1919

2020
#include <lib/support/CodeUtils.h>
21-
#include <lib/support/UnitTestRegistration.h>
2221

2322
// Include entire C++ file to have access to functions-under-test
2423
// such as TokenizeLine despite them being declared within an anonymous namespace.
@@ -99,7 +98,7 @@ static const struct test_shell_vector test_vector_shell_tokenizer[] = {
9998
// Unit tests
10099
// =================================
101100

102-
static void TestShell_Tokenizer(nlTestSuite * inSuite, void * inContext)
101+
TEST(TestShellTokenizeLine, TestShell_Tokenizer)
103102
{
104103
int numOfTestVectors = ArraySize(test_vector_shell_tokenizer);
105104
int numOfTestsRan = 0;
@@ -115,34 +114,13 @@ static void TestShell_Tokenizer(nlTestSuite * inSuite, void * inContext)
115114
char * argv[TEST_SHELL_MAX_TOKENS];
116115
int argc = TokenizeLine(line, argv, TEST_SHELL_MAX_TOKENS);
117116

118-
NL_TEST_ASSERT(inSuite, argc == test_params->argc);
117+
EXPECT_EQ(argc, test_params->argc);
119118

120119
for (int i = 0; i < argc; i++)
121120
{
122-
NL_TEST_ASSERT(inSuite, strcmp(argv[i], test_params->argv[i]) == 0);
121+
EXPECT_EQ(strcmp(argv[i], test_params->argv[i]), 0);
123122
}
124123
numOfTestsRan++;
125124
}
126-
NL_TEST_ASSERT(inSuite, numOfTestsRan > 0);
125+
EXPECT_GT(numOfTestsRan, 0);
127126
}
128-
129-
/**
130-
* Test Suite. It lists all the test functions.
131-
*/
132-
static const nlTest sTests[] = {
133-
134-
NL_TEST_DEF("Test Shell: TestShell_Tokenizer", TestShell_Tokenizer),
135-
136-
NL_TEST_SENTINEL()
137-
};
138-
139-
int TestShellTokenizeLine()
140-
{
141-
nlTestSuite theSuite = { "Test Shell: MainLoop", &sTests[0], nullptr, nullptr };
142-
143-
// Run test suite against one context.
144-
nlTestRunner(&theSuite, nullptr);
145-
return nlTestRunnerStats(&theSuite);
146-
}
147-
148-
CHIP_REGISTER_TEST_SUITE(TestShellTokenizeLine)
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
accesstest
22
PlatformTests
3+
TestShell

src/test_driver/openiotsdk/unit-tests/test_components_nl.txt

-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ SecureChannelTests
1717
SetupPayloadTests
1818
SupportTests
1919
SystemLayerTests
20-
TestShell
2120
TransportLayerTests
2221
UserDirectedCommissioningTests

0 commit comments

Comments
 (0)