Skip to content

Commit be15c9b

Browse files
jlatusekjlatusek
authored
Interaction model to PW (#33160)
1 parent 91f362e commit be15c9b

File tree

2 files changed

+40
-69
lines changed

2 files changed

+40
-69
lines changed

‎src/protocols/interaction_model/tests/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,18 @@
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 = "libInteractionModelTests"
2322

2423
test_sources = [ "TestStatusCode.cpp" ]
2524

2625
public_deps = [
2726
"${chip_root}/src/lib/core",
2827
"${chip_root}/src/lib/support",
29-
"${chip_root}/src/lib/support:testing_nlunit",
3028
"${chip_root}/src/protocols/interaction_model",
31-
"${nlunit_test_root}:nlunit-test",
3229
]
3330

3431
cflags = [ "-Wconversion" ]

‎src/protocols/interaction_model/tests/TestStatusCode.cpp

+39-65
Original file line numberDiff line numberDiff line change
@@ -18,54 +18,51 @@
1818

1919
#include <stdint.h>
2020

21+
#include <gtest/gtest.h>
2122
#include <lib/core/Optional.h>
22-
#include <lib/support/UnitTestExtendedAssertions.h>
23-
#include <lib/support/UnitTestRegistration.h>
2423
#include <protocols/interaction_model/StatusCode.h>
2524

26-
#include <nlunit-test.h>
27-
2825
using namespace ::chip;
2926
using namespace ::chip::Protocols::InteractionModel;
3027

3128
namespace {
3229

33-
void TestStatusBasicValues(nlTestSuite * inSuite, void * inContext)
30+
TEST(TestStatusCode, TestStatusBasicValues)
3431
{
35-
NL_TEST_ASSERT_EQUALS(inSuite, static_cast<int>(Status::Success), 0);
36-
NL_TEST_ASSERT_EQUALS(inSuite, static_cast<int>(Status::Failure), 1);
37-
NL_TEST_ASSERT_EQUALS(inSuite, static_cast<int>(Status::UnsupportedEndpoint), 0x7f);
38-
NL_TEST_ASSERT_EQUALS(inSuite, static_cast<int>(Status::InvalidInState), 0xcb);
32+
EXPECT_EQ(static_cast<int>(Status::Success), 0);
33+
EXPECT_EQ(static_cast<int>(Status::Failure), 1);
34+
EXPECT_EQ(static_cast<int>(Status::UnsupportedEndpoint), 0x7f);
35+
EXPECT_EQ(static_cast<int>(Status::InvalidInState), 0xcb);
3936
}
4037

41-
void TestClusterStatusCode(nlTestSuite * inSuite, void * inContext)
38+
TEST(TestStatusCode, TestClusterStatusCode)
4239
{
4340
// Basic usage as a Status.
4441
{
4542
ClusterStatusCode status_code_success{ Status::Success };
46-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_success, Status::Success);
47-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_success.GetStatus(), Status::Success);
48-
NL_TEST_ASSERT(inSuite, !status_code_success.HasClusterSpecificCode());
49-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_success.GetClusterSpecificCode(), chip::NullOptional);
50-
NL_TEST_ASSERT(inSuite, status_code_success.IsSuccess());
43+
EXPECT_EQ(status_code_success, Status::Success);
44+
EXPECT_EQ(status_code_success.GetStatus(), Status::Success);
45+
EXPECT_FALSE(status_code_success.HasClusterSpecificCode());
46+
EXPECT_EQ(status_code_success.GetClusterSpecificCode(), chip::NullOptional);
47+
EXPECT_TRUE(status_code_success.IsSuccess());
5148

5249
ClusterStatusCode status_code_failure{ Status::Failure };
53-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure, Status::Failure);
54-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure.GetStatus(), Status::Failure);
55-
NL_TEST_ASSERT(inSuite, !status_code_failure.HasClusterSpecificCode());
56-
NL_TEST_ASSERT(inSuite, !status_code_failure.IsSuccess());
50+
EXPECT_EQ(status_code_failure, Status::Failure);
51+
EXPECT_EQ(status_code_failure.GetStatus(), Status::Failure);
52+
EXPECT_FALSE(status_code_failure.HasClusterSpecificCode());
53+
EXPECT_FALSE(status_code_failure.IsSuccess());
5754

5855
ClusterStatusCode status_code_unsupported_ep{ Status::UnsupportedEndpoint };
59-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_unsupported_ep, Status::UnsupportedEndpoint);
60-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_unsupported_ep.GetStatus(), Status::UnsupportedEndpoint);
61-
NL_TEST_ASSERT(inSuite, !status_code_unsupported_ep.HasClusterSpecificCode());
62-
NL_TEST_ASSERT(inSuite, !status_code_unsupported_ep.IsSuccess());
56+
EXPECT_EQ(status_code_unsupported_ep, Status::UnsupportedEndpoint);
57+
EXPECT_EQ(status_code_unsupported_ep.GetStatus(), Status::UnsupportedEndpoint);
58+
EXPECT_FALSE(status_code_unsupported_ep.HasClusterSpecificCode());
59+
EXPECT_FALSE(status_code_unsupported_ep.IsSuccess());
6360

6461
ClusterStatusCode status_code_invalid_in_state{ Status::InvalidInState };
65-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_invalid_in_state, Status::InvalidInState);
66-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_invalid_in_state.GetStatus(), Status::InvalidInState);
67-
NL_TEST_ASSERT(inSuite, !status_code_invalid_in_state.HasClusterSpecificCode());
68-
NL_TEST_ASSERT(inSuite, !status_code_invalid_in_state.IsSuccess());
62+
EXPECT_EQ(status_code_invalid_in_state, Status::InvalidInState);
63+
EXPECT_EQ(status_code_invalid_in_state.GetStatus(), Status::InvalidInState);
64+
EXPECT_FALSE(status_code_invalid_in_state.HasClusterSpecificCode());
65+
EXPECT_FALSE(status_code_invalid_in_state.IsSuccess());
6966
}
7067

7168
enum RobotoClusterStatus : uint8_t
@@ -77,59 +74,36 @@ void TestClusterStatusCode(nlTestSuite * inSuite, void * inContext)
7774
// Cluster-specific usage.
7875
{
7976
ClusterStatusCode status_code_success = ClusterStatusCode::ClusterSpecificSuccess(RobotoClusterStatus::kSauceSuccess);
80-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_success, Status::Success);
81-
NL_TEST_ASSERT(inSuite, status_code_success.HasClusterSpecificCode());
82-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_success.GetClusterSpecificCode(),
83-
static_cast<uint8_t>(RobotoClusterStatus::kSauceSuccess));
84-
NL_TEST_ASSERT(inSuite, status_code_success.IsSuccess());
77+
EXPECT_EQ(status_code_success, Status::Success);
78+
EXPECT_TRUE(status_code_success.HasClusterSpecificCode());
79+
EXPECT_EQ(status_code_success.GetClusterSpecificCode(), static_cast<uint8_t>(RobotoClusterStatus::kSauceSuccess));
80+
EXPECT_TRUE(status_code_success.IsSuccess());
8581

8682
ClusterStatusCode status_code_failure = ClusterStatusCode::ClusterSpecificFailure(RobotoClusterStatus::kSandwichError);
87-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure, Status::Failure);
88-
NL_TEST_ASSERT(inSuite, status_code_failure.HasClusterSpecificCode());
89-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure.GetClusterSpecificCode(),
90-
static_cast<uint8_t>(RobotoClusterStatus::kSandwichError));
91-
NL_TEST_ASSERT(inSuite, !status_code_failure.IsSuccess());
83+
EXPECT_EQ(status_code_failure, Status::Failure);
84+
EXPECT_TRUE(status_code_failure.HasClusterSpecificCode());
85+
EXPECT_EQ(status_code_failure.GetClusterSpecificCode(), static_cast<uint8_t>(RobotoClusterStatus::kSandwichError));
86+
EXPECT_FALSE(status_code_failure.IsSuccess());
9287
}
9388

9489
// Copy/Assignment
9590
{
9691
ClusterStatusCode status_code_failure1 = ClusterStatusCode::ClusterSpecificFailure(RobotoClusterStatus::kSandwichError);
9792
ClusterStatusCode status_code_failure2(status_code_failure1);
9893

99-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure1, status_code_failure2);
100-
NL_TEST_ASSERT(inSuite, status_code_failure1.HasClusterSpecificCode());
101-
NL_TEST_ASSERT(inSuite, status_code_failure2.HasClusterSpecificCode());
94+
EXPECT_EQ(status_code_failure1, status_code_failure2);
95+
EXPECT_TRUE(status_code_failure1.HasClusterSpecificCode());
96+
EXPECT_TRUE(status_code_failure2.HasClusterSpecificCode());
10297

103-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure1.GetClusterSpecificCode(),
104-
static_cast<uint8_t>(RobotoClusterStatus::kSandwichError));
105-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure2.GetClusterSpecificCode(),
106-
static_cast<uint8_t>(RobotoClusterStatus::kSandwichError));
98+
EXPECT_EQ(status_code_failure1.GetClusterSpecificCode(), static_cast<uint8_t>(RobotoClusterStatus::kSandwichError));
99+
EXPECT_EQ(status_code_failure2.GetClusterSpecificCode(), static_cast<uint8_t>(RobotoClusterStatus::kSandwichError));
107100

108101
ClusterStatusCode status_code_failure3{ Status::InvalidCommand };
109-
NL_TEST_ASSERT(inSuite, status_code_failure2 != status_code_failure3);
102+
EXPECT_NE(status_code_failure2, status_code_failure3);
110103

111104
status_code_failure3 = status_code_failure2;
112-
NL_TEST_ASSERT_EQUALS(inSuite, status_code_failure2, status_code_failure3);
105+
EXPECT_EQ(status_code_failure2, status_code_failure3);
113106
}
114107
}
115108

116-
// clang-format off
117-
const nlTest sTests[] =
118-
{
119-
NL_TEST_DEF("TestStatusBasicValues", TestStatusBasicValues),
120-
NL_TEST_DEF("TestClusterStatusCode", TestClusterStatusCode),
121-
NL_TEST_SENTINEL()
122-
};
123-
// clang-format on
124-
125-
nlTestSuite sSuite = { "Test IM Status Code abstractions", &sTests[0], nullptr, nullptr };
126109
} // namespace
127-
128-
int TestClusterStatusCode()
129-
{
130-
nlTestRunner(&sSuite, nullptr);
131-
132-
return (nlTestRunnerStats(&sSuite));
133-
}
134-
135-
CHIP_REGISTER_TEST_SUITE(TestClusterStatusCode)

0 commit comments

Comments
 (0)