removing NL from nrf and ESP32

Alami-Amine · Jun 12, 2024 · b81bc07 · b81bc07
1 parent fad02cf
commit b81bc07
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 17 deletions.
diff --git a/examples/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp b/examples/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp
@@ -30,12 +30,9 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/UnitTest.h>
-#include <lib/support/UnitTestRegistration.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/android/AndroidChipPlatform-JNI.h>
 
-#include <nlunit-test.h>
-
 using namespace chip;
 
 namespace {
@@ -194,9 +191,7 @@ extern "C" JNIEXPORT jint Java_com_tcl_chip_chiptest_TestEngine_runTest(JNIEnv *
 {
     nlTestSetLogger(&jni_test_logger);
     chip::DeviceLayer::StackLock lock;
-    // TODO [PW_MIGRATION] Remove NLUnit tests call after migration
-    jint ret = RunRegisteredUnitTests();
-    ret += chip::test::RunAllTests();
+    jint ret = chip::test::RunAllTests();
 
     return ret;
 }
diff --git 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/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/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
@@ -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
@@ -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/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);