Convert support tests to auto test driver building (#3982)

* Convert support tests to auto test driver building * Restyle fixes * Rename unit tests * Allow persisted storage test only on mac and linux * Restyle fixes * Update TestUtils.h to UnitTestRegistration.h * Move TestPool to auto test driver generation
project-chip · Dec 7, 2020 · 5813d4a · 5813d4a
1 parent c5099ed
commit 5813d4a
Show file tree

Hide file tree

Showing 27 changed files with 43 additions and 481 deletions.
diff --git a/src/lib/support/tests/BUILD.gn b/src/lib/support/tests/BUILD.gn
@@ -20,23 +20,29 @@ import("${chip_root}/build/chip/chip_test_suite.gni")
 chip_test_suite("tests") {
   output_name = "libSupportTests"
 
-  sources = [
+  test_sources = [
     "TestBufBound.cpp",
     "TestBufferReader.cpp",
     "TestCHIPArgParser.cpp",
     "TestCHIPCounter.cpp",
     "TestCHIPMem.cpp",
     "TestErrorStr.cpp",
-    "TestPersistedCounter.cpp",
-    "TestPersistedStorageImplementation.cpp",
-    "TestPersistedStorageImplementation.h",
     "TestPool.cpp",
     "TestSafeInt.cpp",
     "TestScopedBuffer.cpp",
     "TestSerializableIntegerSet.cpp",
-    "TestSupport.h",
     "TestTimeUtils.cpp",
   ]
+  sources = []
+
+  if (current_os == "linux" || current_os == "mac") {
+    # persisted counter unit test uses file-based persistent storage
+    test_sources += [ "TestPersistedCounter.cpp" ]
+    sources += [
+      "TestPersistedStorageImplementation.cpp",
+      "TestPersistedStorageImplementation.h",
+    ]
+  }
 
   cflags = [ "-Wconversion" ]
 
@@ -45,19 +51,4 @@ chip_test_suite("tests") {
     "${chip_root}/src/platform",
     "${nlunit_test_root}:nlunit-test",
   ]
-
-  tests = [
-    "TestBufBound",
-    "TestBufferReader",
-    "TestErrorStr",
-    "TestCHIPArgParser",
-    "TestTimeUtils",
-    "TestCHIPMem",
-    "TestCHIPCounter",
-    "TestPersistedCounter",
-    "TestPool",
-    "TestSafeInt",
-    "TestScopedBuffer",
-    "TestSerializableIntegerSet",
-  ]
 }
diff --git a/src/lib/support/tests/TestBufBound.cpp b/src/lib/support/tests/TestBufBound.cpp
@@ -22,8 +22,6 @@
  *
  */
 
-#include "TestSupport.h"
-
 #include <support/BufBound.h>
 #include <support/UnitTestRegistration.h>
 

diff --git a/src/lib/support/tests/TestBufBoundDriver.cpp b/src/lib/support/tests/TestBufBoundDriver.cpp
diff --git a/src/lib/support/tests/TestBufferReader.cpp b/src/lib/support/tests/TestBufferReader.cpp
@@ -22,8 +22,6 @@
  *
  */
 
-#include "TestSupport.h"
-
 #include <support/BufferReader.h>
 #include <support/UnitTestRegistration.h>
 #include <type_traits>

diff --git a/src/lib/support/tests/TestBufferReaderDriver.cpp b/src/lib/support/tests/TestBufferReaderDriver.cpp
diff --git a/src/lib/support/tests/TestCHIPArgParser.cpp b/src/lib/support/tests/TestCHIPArgParser.cpp
@@ -17,19 +17,17 @@
  *    limitations under the License.
  */
 
-#include "TestSupport.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <core/CHIPCore.h>
+#include <support/CHIPArgParser.hpp>
 #include <support/CHIPMem.h>
 #include <support/CHIPMemString.h>
-
-#include <support/CHIPArgParser.hpp>
 #include <support/ScopedBuffer.h>
+#include <support/UnitTestRegistration.h>
 
 #if CHIP_CONFIG_ENABLE_ARG_PARSER
 
@@ -761,6 +759,11 @@ static void HandleArgError(const char * msg, ...)
 
 int TestCHIPArgParser(void)
 {
+    if (chip::Platform::MemoryInit() != CHIP_NO_ERROR)
+    {
+        return EXIT_FAILURE;
+    }
+
     SimpleParseTest_SingleLongOption();
     SimpleParseTest_SingleShortOption();
     SimpleParseTest_SingleLongOptionWithValue();
@@ -792,3 +795,5 @@ int TestCHIPArgParser(void)
     return (EXIT_SUCCESS);
 }
 #endif // CHIP_CONFIG_ENABLE_ARG_PARSER
+
+CHIP_REGISTER_TEST_SUITE(TestCHIPArgParser);
diff --git a/src/lib/support/tests/TestCHIPArgParserDriver.cpp b/src/lib/support/tests/TestCHIPArgParserDriver.cpp
diff --git a/src/lib/support/tests/TestCHIPCounter.cpp b/src/lib/support/tests/TestCHIPCounter.cpp
@@ -77,7 +77,7 @@ static int TestTeardown(void * inContext)
     return (SUCCESS);
 }
 
-extern "C" int TestCHIPCounter(void)
+int TestCHIPCounter(void)
 {
     // clang-format off
     nlTestSuite theSuite = {

diff --git a/src/lib/support/tests/TestCHIPCounterDriver.cpp b/src/lib/support/tests/TestCHIPCounterDriver.cpp
diff --git a/src/lib/support/tests/TestCHIPMem.cpp b/src/lib/support/tests/TestCHIPMem.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "TestSupport.h"
-
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/src/lib/support/tests/TestCHIPMemDriver.cpp b/src/lib/support/tests/TestCHIPMemDriver.cpp
diff --git a/src/lib/support/tests/TestErrorStr.cpp b/src/lib/support/tests/TestErrorStr.cpp
@@ -15,16 +15,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-#include "TestSupport.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <core/CHIPCore.h>
 
 #include <support/ErrorStr.h>
+#include <support/UnitTestRegistration.h>
 
 using namespace chip;
 
@@ -175,3 +173,5 @@ int TestErrorStr(void)
 
     return EXIT_SUCCESS;
 }
+
+CHIP_REGISTER_TEST_SUITE(TestErrorStr);
diff --git a/src/lib/support/tests/TestErrorStrDriver.cpp b/src/lib/support/tests/TestErrorStrDriver.cpp