diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index 3516c721fa157f..e74ad8afc7a600 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -158,7 +158,8 @@ jobs:
rm -rf ./out
- name: Build unit tests
- # Temporarily disable build due to running out of flash space
+ # Temporarily disabled build due to running out of flash space
+ # TODO Issue #33978: re-enable unit testing after split of unit tests is done
if: false
run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
diff --git a/BUILD.gn b/BUILD.gn
index 5de6441925c6e6..aa443d94e35f52 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
import("//build_overrides/mbedtls.gni")
import("//build_overrides/nlassert.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("//src/lwip/lwip.gni")
@@ -135,7 +134,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
"${chip_root}/src/system",
"${chip_root}/src/transport",
"${nlassert_root}:nlassert",
- "${nlunit_test_root}:nlunit-test",
]
if (enable_fuzz_test_targets) {
diff --git a/build/chip/chip_test_suite.gni b/build/chip/chip_test_suite.gni
index 46b0b1fb7d4399..b4b3cc7d0df868 100644
--- a/build/chip/chip_test_suite.gni
+++ b/build/chip/chip_test_suite.gni
@@ -33,8 +33,8 @@ assert(chip_build_tests)
# ]
#
# test_sources = [
-# "TestFoo.cpp", # Files are parsed for `CHIP_REGISTER_TEST_SUITE(...)`
-# "TestBar.cpp", # and a driver is created automatically
+# "TestFoo.cpp",
+# "TestBar.cpp",
# ]
#
# public_deps = [
@@ -175,100 +175,3 @@ template("chip_test_suite") {
}
}
}
-
-# TODO [PW_MIGRATION]: remove this once transition away from nlunit-test is completed
-template("chip_test_suite_using_nltest") {
- _suite_name = target_name
-
- # Ensures that the common library has sources containing both common
- # and individual unit tests.
- if (!defined(invoker.sources)) {
- invoker.sources = []
- }
-
- if (defined(invoker.test_sources)) {
- invoker.sources += invoker.test_sources
- }
-
- if (chip_build_test_static_libraries) {
- _target_type = "static_library"
- } else {
- _target_type = "source_set"
- }
- target(_target_type, "${_suite_name}.lib") {
- forward_variables_from(invoker, "*", [ "tests" ])
-
- output_dir = "${root_out_dir}/lib"
-
- if (!defined(invoker.public_deps)) {
- public_deps = []
- }
-
- if (current_os != "zephyr" && current_os != "mbed") {
- # Depend on stdio logging, and have it take precedence over the default platform backend
- public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
- }
- }
- if (chip_link_tests) {
- tests = []
-
- if (defined(invoker.test_sources)) {
- foreach(_test, invoker.test_sources) {
- _test_name = string_replace(_test, ".cpp", "")
-
- _driver_name = "${root_gen_dir}/${_test_name}.driver.cpp"
-
- action("${_test_name}_generate_driver") {
- script = "${chip_root}/scripts/gen_test_driver.py"
-
- inputs = [ _test ]
- outputs = [ _driver_name ]
- args = [
- "--input_file=" + rebase_path(_test, root_build_dir),
- "--output_file=" + rebase_path(_driver_name, root_build_dir),
- ]
- }
-
- chip_test(_test_name) {
- sources = [ _driver_name ]
- public_deps = [
- ":${_suite_name}.lib",
- ":${_test_name}_generate_driver",
- ]
- }
- tests += [ _test_name ]
- }
- }
-
- if (defined(invoker.tests)) {
- foreach(_test, invoker.tests) {
- chip_test(_test) {
- sources = [ "${_test}Driver.cpp" ]
-
- public_deps = [ ":${_suite_name}.lib" ]
- }
- tests += [ _test ]
- }
- }
-
- group(_suite_name) {
- deps = []
- foreach(_test, tests) {
- deps += [ ":${_test}" ]
- }
- }
-
- if (chip_pw_run_tests) {
- group("${_suite_name}_run") {
- deps = []
- foreach(_test, tests) {
- deps += [ ":${_test}.run" ]
- }
- }
- }
- } else {
- group(_suite_name) {
- deps = [ ":${_suite_name}.lib" ]
- }
- }
-}
diff --git a/build/chip/fuzz_test.gni b/build/chip/fuzz_test.gni
index 7b683be047d913..784ed60273b02a 100644
--- a/build/chip/fuzz_test.gni
+++ b/build/chip/fuzz_test.gni
@@ -36,7 +36,6 @@ declare_args() {
#
# public_deps = [
# "${chip_root}/src/lib/foo", # add dependencies here
-# "${nlunit_test_root}:nlunit-test",
# ]
# }
#
diff --git a/build_overrides/nlunit_test.gni b/build_overrides/nlunit_test.gni
deleted file mode 100644
index b3b729504b1be1..00000000000000
--- a/build_overrides/nlunit_test.gni
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-declare_args() {
- # Root directory for nlunit-test.
- nlunit_test_root = "//third_party/nlunit-test"
-}
diff --git a/examples/build_overrides/nlunit_test.gni b/examples/build_overrides/nlunit_test.gni
deleted file mode 100644
index ed017adc65f04a..00000000000000
--- a/examples/build_overrides/nlunit_test.gni
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-declare_args() {
- # Root directory for nlunit-test.
- nlunit_test_root = "//third_party/connectedhomeip/third_party/nlunit-test"
-}
diff --git a/scripts/gen_test_driver.py b/scripts/gen_test_driver.py
deleted file mode 100644
index 8bf03bf05d2c84..00000000000000
--- a/scripts/gen_test_driver.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import optparse
-import re
-import sys
-
-TEMPLATE_PREFIX = '''/*
- *
- * Copyright (c) 2020 Project CHIP Authors
- * All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the \"License\");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * THIS FILE WAS GENERATED AUTOMATICALLY BY THE BUILD SYSTEM.
- */
-
-#include <nlunit-test.h>
-
-'''
-
-# Forward declarations will be added here
-
-TEMPLATE_MAIN_START = '''
-int main()
-{
- int code = 0;
-
- nlTestSetOutputStyle(OUTPUT_CSV);
-
-'''
-
-# Test invokation will be added here
-
-TEMPLATE_SUFFIX = '''
- return code;
-}'''
-
-
-def main(argv):
- parser = optparse.OptionParser()
-
- parser.add_option('--input_file')
- parser.add_option('--output_file')
-
- options, _ = parser.parse_args(argv)
-
- tests = []
-
- TEST_SUITE_RE = re.compile(r'\s*CHIP_REGISTER_TEST_SUITE\(([^)]*)\)')
-
- with open(options.input_file, 'r') as input_file:
- for line in input_file.readlines():
- match = TEST_SUITE_RE.match(line)
- if not match:
- continue
-
- tests.append(match.group(1))
-
- if not tests:
- print("ERROR: no tests found in '%s'" % input_file)
- print("Did you forget to CHIP_REGISTER_TEST_SUITE?")
- return 1
-
- with open(options.output_file, 'w') as output_file:
- output_file.write(TEMPLATE_PREFIX)
-
- for test in tests:
- output_file.write("int %s();\n" % test)
- output_file.write("\n")
-
- output_file.write(TEMPLATE_MAIN_START)
-
- for test in tests:
- output_file.write(" code = code | (%s());\n" % test)
- output_file.write("\n")
-
- output_file.write(TEMPLATE_SUFFIX)
-
- return 0
-
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv[1:]))
diff --git a/src/app/icd/server/tests/BUILD.gn b/src/app/icd/server/tests/BUILD.gn
index 08872257796ec0..e96954a97dde58 100644
--- a/src/app/icd/server/tests/BUILD.gn
+++ b/src/app/icd/server/tests/BUILD.gn
@@ -14,7 +14,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/build/chip/chip_test_suite.gni")
import("${chip_root}/src/app/icd/icd.gni")
diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn
index 7c07564b77024e..e8860f01565141 100644
--- a/src/app/tests/BUILD.gn
+++ b/src/app/tests/BUILD.gn
@@ -14,7 +14,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/build/chip/chip_test_suite.gni")
diff --git a/src/app/tests/TestBindingTable.cpp b/src/app/tests/TestBindingTable.cpp
index a4d5d0e2fcf6a7..6efe1cce2e7eef 100644
--- a/src/app/tests/TestBindingTable.cpp
+++ b/src/app/tests/TestBindingTable.cpp
@@ -22,7 +22,6 @@
#include <app/util/config.h>
#include <lib/support/DefaultStorageKeyAllocator.h>
#include <lib/support/TestPersistentStorageDelegate.h>
-#include <lib/support/UnitTestRegistration.h>
using chip::BindingTable;
diff --git a/src/app/tests/TestInteractionModelEngine.cpp b/src/app/tests/TestInteractionModelEngine.cpp
index 1e471da68b01af..7817d3636d3fae 100644
--- a/src/app/tests/TestInteractionModelEngine.cpp
+++ b/src/app/tests/TestInteractionModelEngine.cpp
@@ -29,7 +29,6 @@
#include <lib/core/TLV.h>
#include <lib/core/TLVDebug.h>
#include <lib/core/TLVUtilities.h>
-#include <lib/support/UnitTestExtendedAssertions.h>
#include <lib/support/tests/ExtraPwTestMacros.h>
#include <messaging/ExchangeContext.h>
#include <messaging/Flags.h>
diff --git a/src/app/tests/TestPendingResponseTrackerImpl.cpp b/src/app/tests/TestPendingResponseTrackerImpl.cpp
index 556bf3d87e2b30..5538737e2c709a 100644
--- a/src/app/tests/TestPendingResponseTrackerImpl.cpp
+++ b/src/app/tests/TestPendingResponseTrackerImpl.cpp
@@ -16,7 +16,6 @@
*/
#include <algorithm>
-#include <nlunit-test.h>
#include <vector>
#include <app/PendingResponseTrackerImpl.h>
diff --git a/src/app/util/mock/BUILD.gn b/src/app/util/mock/BUILD.gn
index b63c49e68f2494..59ab39947711c2 100644
--- a/src/app/util/mock/BUILD.gn
+++ b/src/app/util/mock/BUILD.gn
@@ -33,7 +33,6 @@ source_set("mock_ember") {
"${chip_root}/src/app/common:attribute-type",
"${chip_root}/src/lib/core",
"${chip_root}/src/lib/support",
- "${chip_root}/src/lib/support:testing_nlunit",
]
public_configs = [ ":mock_include" ]
diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp
index e4c965e98905f4..97b21967be0313 100644
--- a/src/app/util/mock/attribute-storage.cpp
+++ b/src/app/util/mock/attribute-storage.cpp
@@ -47,7 +47,6 @@
#include <lib/core/TLVDebug.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/DLLUtil.h>
-#include <lib/support/UnitTestRegistration.h>
#include <lib/support/logging/CHIPLogging.h>
#include <app/util/af-types.h>
diff --git a/src/inet/tests/BUILD.gn b/src/inet/tests/BUILD.gn
index 7b0e7706854c35..3111c4e70a4805 100644
--- a/src/inet/tests/BUILD.gn
+++ b/src/inet/tests/BUILD.gn
@@ -14,7 +14,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -58,7 +57,6 @@ static_library("helpers") {
"${chip_root}/src/inet",
"${chip_root}/src/lib/core",
"${chip_root}/src/platform",
- "${nlunit_test_root}:nlunit-test",
]
}
diff --git a/src/lib/dnssd/BUILD.gn b/src/lib/dnssd/BUILD.gn
index 9447821ddcab19..58ce25513c945f 100644
--- a/src/lib/dnssd/BUILD.gn
+++ b/src/lib/dnssd/BUILD.gn
@@ -13,7 +13,6 @@
# limitations under the License.
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("${chip_root}/src/platform/device.gni")
source_set("constants") {
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 34906592214fbd..63b1c7cdde5b0a 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
import("//build_overrides/nlassert.gni")
import("//build_overrides/nlfaultinjection.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("$dir_pw_build/target_types.gni")
@@ -357,23 +356,3 @@ pw_static_library("pw_tests_wrapper") {
"UnitTest.h",
]
}
-
-static_library("testing_nlunit") {
- output_name = "libSupportTesting"
- output_dir = "${root_out_dir}/lib"
-
- sources = [
- "UnitTestContext.h",
- "UnitTestExtendedAssertions.h",
- "UnitTestRegistration.cpp",
- "UnitTestRegistration.h",
- ]
-
- public_deps = [
- ":support",
- "${chip_root}/src/lib/core",
- "${chip_root}/src/platform",
- "${nlassert_root}:nlassert",
- "${nlunit_test_root}:nlunit-test",
- ]
-}
diff --git a/src/lib/support/UnitTestContext.h b/src/lib/support/UnitTestContext.h
deleted file mode 100644
index 01ad5d29d71cb6..00000000000000
--- a/src/lib/support/UnitTestContext.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Copyright (c) 2022 Project CHIP Authors
- * All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-
-#include <nlunit-test.h>
-
-#include <lib/core/CHIPError.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CodeUtils.h>
-
-/**
- * @def NL_TEST_EXIT_ON_FAILED_ASSERT(inSuite, inCondition)
- *
- * @brief
- * This is used to assert the results of a conditional check
- * through out a test in a test suite.
- *
- * @param[in] inSuite A pointer to the test suite the assertion
- * should be accounted against.
- * @param[in] inCondition Code for the logical predicate to be checked
- * for truth. If the condition fails, the
- * assertion fails.
- *
- */
-#define NL_TEST_EXIT_ON_FAILED_ASSERT(inSuite, inCondition) \
- do \
- { \
- NL_TEST_ASSERT(inSuite, inCondition); \
- \
- if (!(inCondition)) \
- { \
- return; \
- } \
- } while (0)
-
-namespace chip {
-
-/// Performs a memory Init/Shutdown in a controlled manner
-/// (i.e. guarantees shutdown is called).
-class ScopedMemoryInit
-{
-public:
- ScopedMemoryInit() { VerifyOrDie(chip::Platform::MemoryInit() == CHIP_NO_ERROR); }
-
- ~ScopedMemoryInit() { chip::Platform::MemoryShutdown(); }
-};
-
-/// Executes nlTestRunner for the given test suite while
-/// allocating the given context type on the heap
-template <class Context, typename... Args>
-inline int ExecuteTestsWithContext(struct _nlTestSuite * suite, Args &&... args)
-{
- {
- ScopedMemoryInit ensureHeapIsInitialized;
- auto ctx = chip::Platform::MakeUnique<Context>(std::forward<Args>(args)...);
- nlTestRunner(suite, ctx.get());
- }
-
- return nlTestRunnerStats(suite);
-}
-
-inline int ExecuteTestsWithoutContext(struct _nlTestSuite * suite)
-{
- nlTestRunner(suite, nullptr);
- return nlTestRunnerStats(suite);
-}
-
-} // namespace chip
diff --git a/src/lib/support/UnitTestExtendedAssertions.h b/src/lib/support/UnitTestExtendedAssertions.h
deleted file mode 100644
index 1552648bed8ac6..00000000000000
--- a/src/lib/support/UnitTestExtendedAssertions.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2022 Project CHIP Authors
- * All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <lib/core/CHIPError.h>
-#include <nlunit-test.h>
-
-/**
- * @def NL_TEST_ASSERT_SUCCESS(inSuite, expression)
- *
- * @brief
- * This is used to assert that an expression is equal to CHIP_NO_ERROR
- * throughout a test in a test suite.
- *
- * @param[in] inSuite A pointer to the test suite the assertion
- * should be accounted against.
- * @param[in] inExpression Expression to be checked for equality to CHIP_NO_ERROR.
- * If the expression is different than CHIP_NO_ERROR, the
- * assertion fails.
- *
- */
-#define NL_TEST_ASSERT_SUCCESS(inSuite, inExpression) \
- do \
- { \
- CHIP_ERROR _inner_err = (inExpression); \
- (inSuite)->performedAssertions += 1; \
- \
- if (_inner_err != CHIP_NO_ERROR) \
- { \
- printf("%s:%u: assertion failed due to error: \"%s\": %" CHIP_ERROR_FORMAT "\n", __FILE__, __LINE__, #inExpression, \
- _inner_err.Format()); \
- (inSuite)->failedAssertions += 1; \
- (inSuite)->flagError = true; \
- } \
- } while (0)
-
-/**
- * @def NL_TEST_ASSERT_EQUALS(inSuite, inExpr1,, inExpr2)
- *
- * @brief
- * This is used to assert that two expressions are equal, and to print both sides on failure. This
- * does not attempt to print the value of variables. It only prints the expressions.
- *
- * @param[in] inSuite A pointer to the test suite the assertion
- * should be accounted against.
- * @param[in] inExpr1 Left hand-side to check
- * @param[in] inExpr2 Right hand-side to check
- *
- */
-#define NL_TEST_ASSERT_EQUALS(inSuite, inExpr1, inExpr2) \
- do \
- { \
- (inSuite)->performedAssertions += 1; \
- \
- if (!((inExpr1) == (inExpr2))) \
- { \
- printf("%s:%u: assertion failed: %s == %s\n", __FILE__, __LINE__, #inExpr1, #inExpr2); \
- (inSuite)->failedAssertions += 1; \
- (inSuite)->flagError = true; \
- } \
- } while (0)
diff --git a/src/lib/support/UnitTestRegistration.cpp b/src/lib/support/UnitTestRegistration.cpp
deleted file mode 100644
index 93ea135b85a9ca..00000000000000
--- a/src/lib/support/UnitTestRegistration.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * Copyright (c) 2020 Project CHIP Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lib/support/UnitTestRegistration.h>
-#include <lib/support/logging/CHIPLogging.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace chip {
-
-const size_t kTestSuitesMax = 256;
-
-typedef struct
-{
- UnitTestTriggerFunction test_suites[kTestSuitesMax];
- uint32_t num_test_suites;
-} test_suites_t;
-
-static test_suites_t gs_test_suites;
-
-#ifdef __ZEPHYR__
-inline static bool AlreadyExists(UnitTestTriggerFunction tests)
-{
- for (uint32_t i = 0; i < gs_test_suites.num_test_suites; ++i)
- if (gs_test_suites.test_suites[i] == tests)
- return true;
- return false;
-}
-#endif
-
-CHIP_ERROR RegisterUnitTests(UnitTestTriggerFunction tests)
-{
- if (gs_test_suites.num_test_suites >= kTestSuitesMax)
- {
- ChipLogError(Support, "Test suits limit reached");
- return CHIP_ERROR_NO_MEMORY;
- }
-
-#ifdef __ZEPHYR__
- // Not sure yet if it's a Zephyr bug or misconfiguration, but global constructors are called
- // twice on native_posix platform - by libc and by Zephyr's main thread initialization code.
- // This makes sure tests are not run twice for that reason.
- if (AlreadyExists(tests))
- return CHIP_NO_ERROR;
-#endif
-
- gs_test_suites.test_suites[gs_test_suites.num_test_suites] = tests;
- gs_test_suites.num_test_suites++;
- return CHIP_NO_ERROR;
-}
-
-int RunRegisteredUnitTests()
-{
- int status = 0;
- for (uint32_t i = 0; i < gs_test_suites.num_test_suites; i++)
- {
- status += gs_test_suites.test_suites[i]();
- }
- return status;
-}
-
-} // namespace chip
diff --git a/src/lib/support/UnitTestRegistration.h b/src/lib/support/UnitTestRegistration.h
deleted file mode 100644
index be7cc710a9278d..00000000000000
--- a/src/lib/support/UnitTestRegistration.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Copyright (c) 2020 Project CHIP Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <lib/core/CHIPError.h>
-#include <lib/support/CodeUtils.h>
-
-/**
- * @def CHIP_REGISTER_TEST_SUITE(FUNCTION)
- *
- * @brief
- * Registers a unit test suite runner
- *
- * Adds a function of the signature int(*)() to the list of test runners which
- * should be invoked when chip::RunRegisteredUnitTests() is called.
- *
- * Example:
- *
- * @code
- * int MyTestSuiteRunner()
- * {
- * if (!RunSomeTests())
- * return -1; // test failure
- * return 0; // test success
- * }
- *
- * CHIP_REGISTER_TEST_SUITE(MyTestSuiteRunner)
- * @endcode
- */
-#define CHIP_REGISTER_TEST_SUITE(FUNCTION) \
- static void __attribute__((constructor)) Register##FUNCTION(void) \
- { \
- VerifyOrDie(chip::RegisterUnitTests(&FUNCTION) == CHIP_NO_ERROR); \
- }
-
-// TODO: remove these once transition to pw_unit_test is completed
-#define NL_TEST_WRAP_FUNCTION(FUNCTION) \
- [](void * _context) -> int { \
- FUNCTION(); \
- return SUCCESS; \
- }
-
-#define NL_TEST_WRAP_METHOD(CLASS, METHOD) \
- [](void * context) -> int { \
- auto ctx = static_cast<CLASS *>(context); \
- ctx->METHOD(); \
- return SUCCESS; \
- }
-
-namespace chip {
-
-typedef int (*UnitTestTriggerFunction)();
-
-CHIP_ERROR RegisterUnitTests(UnitTestTriggerFunction tests);
-
-int RunRegisteredUnitTests();
-
-} // namespace chip
diff --git a/src/lib/support/tests/BUILD.gn b/src/lib/support/tests/BUILD.gn
index b8cdcfeb2e059f..659ba00d0395ff 100644
--- a/src/lib/support/tests/BUILD.gn
+++ b/src/lib/support/tests/BUILD.gn
@@ -14,7 +14,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/build/chip/chip_test_suite.gni")
diff --git a/src/setup_payload/tests/BUILD.gn b/src/setup_payload/tests/BUILD.gn
index 23022aad8ffafc..c3013c94f5acb5 100644
--- a/src/setup_payload/tests/BUILD.gn
+++ b/src/setup_payload/tests/BUILD.gn
@@ -14,7 +14,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/build/chip/chip_test_suite.gni")
diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn
index 4fa18959f94642..76b4df8e8bc8ec 100644
--- a/src/test_driver/efr32/BUILD.gn
+++ b/src/test_driver/efr32/BUILD.gn
@@ -27,7 +27,6 @@ import("${chip_root}/src/platform/device.gni")
import("$dir_pw_build/python.gni")
import("$dir_pw_protobuf_compiler/proto.gni")
-import("//build_overrides/nlunit_test.gni")
assert(current_os == "freertos")
efr32_project_dir = "${chip_root}/src/test_driver/efr32"
@@ -86,9 +85,7 @@ silabs_executable("efr32_device_tests") {
"${chip_root}/src:tests",
"${chip_root}/src/lib",
"${chip_root}/src/lib/support:pw_tests_wrapper",
- "${chip_root}/src/lib/support:testing_nlunit",
"${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs",
- "${nlunit_test_root}:nlunit-test",
]
# OpenThread Settings
diff --git a/src/test_driver/efr32/src/main.cpp b/src/test_driver/efr32/src/main.cpp
index 2634d9413df95e..010d6b4bc0639b 100644
--- a/src/test_driver/efr32/src/main.cpp
+++ b/src/test_driver/efr32/src/main.cpp
@@ -28,10 +28,8 @@
#include <lib/support/CHIPMem.h>
#include <lib/support/CHIPPlatformMemory.h>
#include <lib/support/UnitTest.h>
-#include <lib/support/UnitTestRegistration.h>
#include <mbedtls/platform.h>
#include <nl_test_service/nl_test.rpc.pb.h>
-#include <nlunit-test.h>
#include <pigweed/RpcService.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/KeyValueStoreManager.h>
@@ -58,114 +56,12 @@ class NlTest : public pw_rpc::nanopb::NlTest::Service<NlTest>
public:
void Run(const pw_protobuf_Empty & request, ServerWriter<chip_rpc_Event> & writer)
{
- stream_writer = &writer;
- nlTestSetLogger(&nl_test_logger);
-
- printf("--- Running nltest ---");
- int status = RunRegisteredUnitTests();
- printf("--- Running gtest ---");
- status += chip::test::RunAllTests();
+ printf("--- Running pw_unit_test ---");
+ int status = chip::test::RunAllTests();
printf("Test status: %d", status);
- stream_writer = nullptr;
- writer.Finish();
- }
-
-private:
- static ServerWriter<chip_rpc_Event> * stream_writer;
- nl_test_output_logger_t nl_test_logger = {
- chip_nl_test_log_name, chip_nl_test_log_initialize, chip_nl_test_log_terminate, chip_nl_test_log_setup,
- chip_nl_test_log_test, chip_nl_test_log_teardown, chip_nl_test_log_statTest, chip_nl_test_log_statAssert,
- };
-
- static void StreamLogEvent(const chip_rpc_Event & event)
- {
- if (!stream_writer)
- {
- return;
- }
- stream_writer->Write(event);
- }
-
- static void chip_nl_test_log_name(struct _nlTestSuite * inSuite)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_suite_start_tag;
- snprintf(event.type.test_suite_start.suite_name, sizeof(event.type.test_suite_start.suite_name), "%s", inSuite->name);
- StreamLogEvent(event);
- }
-
- static void chip_nl_test_log_initialize(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_case_initialize_tag;
- snprintf(event.type.test_case_initialize.suite_name, sizeof(event.type.test_case_initialize.suite_name), "%s",
- inSuite->name);
- event.type.test_case_initialize.failed = inResult == FAILURE;
- StreamLogEvent(event);
- }
- static void chip_nl_test_log_terminate(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_case_terminate_tag;
- snprintf(event.type.test_case_terminate.suite_name, sizeof(event.type.test_case_terminate.suite_name), "%s", inSuite->name);
- event.type.test_case_terminate.failed = inResult == FAILURE;
- StreamLogEvent(event);
- }
-
- static void chip_nl_test_log_setup(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_suite_setup_tag;
- snprintf(event.type.test_suite_setup.suite_name, sizeof(event.type.test_suite_setup.suite_name), "%s", inSuite->name);
- event.type.test_suite_setup.failed = inResult == FAILURE;
- StreamLogEvent(event);
- }
-
- static void chip_nl_test_log_teardown(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_suite_teardown_tag;
- snprintf(event.type.test_suite_teardown.suite_name, sizeof(event.type.test_suite_teardown.suite_name), "%s", inSuite->name);
- event.type.test_suite_teardown.failed = inResult == FAILURE;
- StreamLogEvent(event);
- }
-
- static void chip_nl_test_log_test(struct _nlTestSuite * inSuite, int inWidth, int inIndex)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_case_run_tag;
- snprintf(event.type.test_case_run.suite_name, sizeof(event.type.test_case_run.suite_name), "%s", inSuite->name);
- snprintf(event.type.test_case_run.test_case_name, sizeof(event.type.test_case_run.test_case_name), "%s",
- inSuite->tests[inIndex].name);
- event.type.test_case_run.failed = inSuite->flagError;
- StreamLogEvent(event);
- }
-
- static void chip_nl_test_log_statTest(struct _nlTestSuite * inSuite)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_suite_tests_run_summary_tag;
- snprintf(event.type.test_suite_tests_run_summary.suite_name, sizeof(event.type.test_suite_tests_run_summary.suite_name),
- "%s", inSuite->name);
- event.type.test_suite_tests_run_summary.total_count = inSuite->runTests;
- event.type.test_suite_tests_run_summary.failed_count = inSuite->failedTests;
- StreamLogEvent(event);
- }
-
- static void chip_nl_test_log_statAssert(struct _nlTestSuite * inSuite)
- {
- chip_rpc_Event event = chip_rpc_Event_init_default;
- event.which_type = chip_rpc_Event_test_suite_asserts_summary_tag;
- snprintf(event.type.test_suite_asserts_summary.suite_name, sizeof(event.type.test_suite_asserts_summary.suite_name), "%s",
- inSuite->name);
- event.type.test_suite_asserts_summary.total_count = inSuite->performedAssertions;
- event.type.test_suite_asserts_summary.failed_count = inSuite->failedAssertions;
- StreamLogEvent(event);
}
};
-NlTest::ServerWriter<chip_rpc_Event> * NlTest::stream_writer = 0;
-
} // namespace chip::rpc
namespace {
diff --git a/src/test_driver/esp32/cmake/esp32_unit_tests.cmake b/src/test_driver/esp32/cmake/esp32_unit_tests.cmake
index 05eda6d52fb1a6..99765d8ecbfdc6 100644
--- a/src/test_driver/esp32/cmake/esp32_unit_tests.cmake
+++ b/src/test_driver/esp32/cmake/esp32_unit_tests.cmake
@@ -37,9 +37,7 @@ macro(esp32_unit_test)
-Wl,--whole-archive ${UNIT_TEST_LIBRARY} -Wl,--no-whole-archive
${UNIT_TEST_EXTRA_LIBRARIES}
-lVectorTlv
- -lSupportTesting
-lTestUtils
- nlunit-test
nlfaultinjection
)
diff --git a/src/test_driver/esp32/main/CMakeLists.txt b/src/test_driver/esp32/main/CMakeLists.txt
index 26cd4080e643d9..d5e566ad7a48ff 100644
--- a/src/test_driver/esp32/main/CMakeLists.txt
+++ b/src/test_driver/esp32/main/CMakeLists.txt
@@ -45,4 +45,4 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
)
target_link_directories(${COMPONENT_LIB} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../chip/lib)
-target_link_libraries(${COMPONENT_LIB} PUBLIC -lSupportTesting -lPWTestsWrapper)
+target_link_libraries(${COMPONENT_LIB} PUBLIC -lPWTestsWrapper)
diff --git a/src/test_driver/esp32/main/main_app.cpp b/src/test_driver/esp32/main/main_app.cpp
index 3f6cd19b282975..e5f6794ef1ddc4 100644
--- a/src/test_driver/esp32/main/main_app.cpp
+++ b/src/test_driver/esp32/main/main_app.cpp
@@ -31,7 +31,6 @@
#include <crypto/CHIPCryptoPAL.h>
#include <lib/core/ErrorStr.h>
#include <lib/support/UnitTest.h>
-#include <lib/support/UnitTestRegistration.h>
#include <platform/CHIPDeviceLayer.h>
using namespace ::chip;
@@ -42,9 +41,7 @@ const char TAG[] = "CHIP-tests";
static void tester_task(void * pvParameters)
{
ESP_LOGI(TAG, "Starting CHIP tests!");
- // TODO [PW_MIGRATION] Remove NLUnit tests call after migration
- int status = RunRegisteredUnitTests();
- status += chip::test::RunAllTests();
+ int status = chip::test::RunAllTests();
ESP_LOGI(TAG, "CHIP test status: %d", status);
exit(status);
}
diff --git a/src/test_driver/mbed/unit_tests/main/main.cpp b/src/test_driver/mbed/unit_tests/main/main.cpp
index f3fbc445eb4773..bf2f95d0fd154a 100644
--- a/src/test_driver/mbed/unit_tests/main/main.cpp
+++ b/src/test_driver/mbed/unit_tests/main/main.cpp
@@ -17,7 +17,6 @@
*/
#include "netsocket/WiFiInterface.h"
-#include <lib/support/UnitTestRegistration.h>
#include <lib/support/logging/CHIPLogging.h>
#include <platform/mbed/Logging.h>
@@ -63,8 +62,15 @@ int main()
ChipLogProgress(NotSpecified, "Mbed unit-tests application run");
- int status = RunRegisteredUnitTests();
- ChipLogProgress(NotSpecified, "CHIP test status: %d", status);
+ // TODO Issue #33978
+ // Migration to pw_unit_tests was not done for mbed since the unit-testing FW used to run out of flash and was disabled from
+ // GitHub Actions workflow
+
+ // int status = RunRegisteredUnitTests();
+ // ChipLogProgress(NotSpecified, "CHIP test status: %d", status);
+
+ ChipLogError(NotSpecified, "Unit Tests are currently DISABLED for Mbed");
+ int status = 1;
return status;
}
diff --git a/src/test_driver/nrfconnect/main/runner.cpp b/src/test_driver/nrfconnect/main/runner.cpp
index d779f1d5300d09..44fb5bae2a6183 100644
--- a/src/test_driver/nrfconnect/main/runner.cpp
+++ b/src/test_driver/nrfconnect/main/runner.cpp
@@ -17,7 +17,6 @@
#include <lib/support/CodeUtils.h>
#include <lib/support/UnitTest.h>
-#include <lib/support/UnitTestRegistration.h>
#include <platform/CHIPDeviceLayer.h>
#include <unistd.h>
@@ -37,7 +36,6 @@ extern "C" int main(void)
LOG_INF("Starting CHIP tests!");
int status = 0;
status += chip::test::RunAllTests();
- status += RunRegisteredUnitTests();
LOG_INF("CHIP test status: %d", status);
_exit(status);
diff --git a/src/test_driver/openiotsdk/unit-tests/main/include/NlTestLogger.h b/src/test_driver/openiotsdk/unit-tests/main/include/NlTestLogger.h
deleted file mode 100644
index f43e3e19081fc2..00000000000000
--- a/src/test_driver/openiotsdk/unit-tests/main/include/NlTestLogger.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Copyright (c) 2022 Project CHIP Authors
- * All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * Custom NL test logger implementation
- *
- */
-
-#include <nlunit-test.h>
-#include <stdio.h>
-
-class NlTestLogger
-{
- static void def_log_name(struct _nlTestSuite * inSuite) { printf("[ %s ]\r\n", inSuite->name); }
-
- static void def_log_initialize(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- printf("[ %s : %-*s ] : %s\r\n", inSuite->name, inWidth, "Initialize", inResult == FAILURE ? "FAILED" : "PASSED");
- }
- static void def_log_terminate(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- printf("[ %s : %-*s ] : %s\r\n", inSuite->name, inWidth, "Terminate", inResult == FAILURE ? "FAILED" : "PASSED");
- }
-
- static void def_log_setup(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- printf("[ %s : %-*s ] : %s\r\n", inSuite->name, inWidth, "Setup", inResult == FAILURE ? "FAILED" : "PASSED");
- }
-
- static void def_log_test(struct _nlTestSuite * inSuite, int inWidth, int inIndex)
- {
- printf("[ %s : %-*s ] : %s\r\n", inSuite->name, inWidth, inSuite->tests[inIndex].name,
- inSuite->flagError ? "FAILED" : "PASSED");
- }
-
- static void def_log_teardown(struct _nlTestSuite * inSuite, int inResult, int inWidth)
- {
- printf("[ %s : %-*s ] : %s\r\n", inSuite->name, inWidth, "TearDown", inResult == FAILURE ? "FAILED" : "PASSED");
- }
-
- static void def_log_statTest(struct _nlTestSuite * inSuite)
- {
- printf("Failed Tests: %d / %d\r\n", inSuite->failedTests, inSuite->runTests);
- }
-
- static void def_log_statAssert(struct _nlTestSuite * inSuite)
- {
- printf("Failed Asserts: %d / %d\r\n", inSuite->failedAssertions, inSuite->performedAssertions);
- }
-
-public:
- static constexpr nl_test_output_logger_t nl_test_logger = {
- def_log_name, def_log_initialize, def_log_terminate, def_log_setup,
- def_log_test, def_log_teardown, def_log_statTest, def_log_statAssert,
- };
-};
diff --git a/src/tracing/tests/BUILD.gn b/src/tracing/tests/BUILD.gn
index f6b4f132255af0..fcb9bc2810544d 100644
--- a/src/tracing/tests/BUILD.gn
+++ b/src/tracing/tests/BUILD.gn
@@ -14,7 +14,6 @@
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")
import("${chip_root}/src/tracing/tracing_args.gni")
@@ -30,11 +29,9 @@ if (matter_enable_tracing_support &&
]
public_deps = [
- "${chip_root}/src/lib/support:testing_nlunit",
"${chip_root}/src/platform",
"${chip_root}/src/tracing",
"${chip_root}/src/tracing:macros",
- "${nlunit_test_root}:nlunit-test",
]
}
}
diff --git a/src/tracing/tests/TestMetricEvents.cpp b/src/tracing/tests/TestMetricEvents.cpp
index 17e4cd69797177..a0190265d57e0b 100644
--- a/src/tracing/tests/TestMetricEvents.cpp
+++ b/src/tracing/tests/TestMetricEvents.cpp
@@ -14,7 +14,6 @@
* limitations under the License.
*/
#include <gtest/gtest.h>
-#include <lib/support/UnitTestRegistration.h>
#include <tracing/backend.h>
#include <tracing/metric_event.h>
diff --git a/src/tracing/tests/TestTracing.cpp b/src/tracing/tests/TestTracing.cpp
index 88d2a10c772579..254c6de5c78cb7 100644
--- a/src/tracing/tests/TestTracing.cpp
+++ b/src/tracing/tests/TestTracing.cpp
@@ -14,7 +14,6 @@
* limitations under the License.
*/
#include <gtest/gtest.h>
-#include <lib/support/UnitTestRegistration.h>
#include <tracing/backend.h>
#include <tracing/macros.h>
#include <tracing/registry.h>
diff --git a/src/transport/raw/tests/BUILD.gn b/src/transport/raw/tests/BUILD.gn
index a6bc6a5a017524..1ac84f3d097700 100644
--- a/src/transport/raw/tests/BUILD.gn
+++ b/src/transport/raw/tests/BUILD.gn
@@ -14,7 +14,6 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/src/inet/inet.gni")