address PR comments

CesiumGS · Oct 5, 2023 · d4520ff · d4520ff
1 parent ed4a477
commit d4520ff
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.vscode/launch.linux.json b/.vscode/launch.linux.json
@@ -111,7 +111,11 @@
         {
           "text": "set print elements 0"
         }
-      ]
+      ],
+      "symbolLoadInfo": {
+        "loadAll": false,
+        "exceptionList": "libcesium.omniverse.plugin.so;libcesium.omniverse.cpp.tests.plugin.so"
+      }
     },
     {
       "name": "Python Debugging (attach)",

diff --git a/cesiumOmniverseCppTestsExtension/bindings/PythonBindings.cpp b/cesiumOmniverseCppTestsExtension/bindings/PythonBindings.cpp
@@ -15,7 +15,7 @@ PYBIND11_MODULE(CesiumOmniverseCppTestsPythonBindings, m) {
     // clang-format off
     carb::defineInterfaceClass<ICesiumOmniverseCppTestsInterface>(
         m, "ICesiumOmniverseCppTestsInterface", "acquire_cesium_omniverse_tests_interface", "release_cesium_omniverse_tests_interface")
-        .def("run_all_tests", &ICesiumOmniverseCppTestsInterface::run_all_tests)
+        .def("run_all_tests", &ICesiumOmniverseCppTestsInterface::runAllTests)
         .def("on_startup", &ICesiumOmniverseCppTestsInterface::onStartup)
         .def("on_shutdown", &ICesiumOmniverseCppTestsInterface::onShutdown);
     // clang-format on

diff --git a/cesiumOmniverseCppTestsExtension/include/CesiumOmniverseCppTests.h b/cesiumOmniverseCppTestsExtension/include/CesiumOmniverseCppTests.h
@@ -18,7 +18,7 @@ class ICesiumOmniverseCppTestsInterface {
      */
     virtual void onShutdown() noexcept = 0;
 
-    virtual void run_all_tests(long int stage_id) noexcept = 0;
+    virtual void runAllTests(long int stage_id) noexcept = 0;
 };
 
 } // namespace cesium::omniverse::tests
diff --git a/cesiumOmniverseCppTestsExtension/include/UsdUtilTests.h b/cesiumOmniverseCppTestsExtension/include/UsdUtilTests.h
@@ -1,3 +1,3 @@
 #pragma once
 
-void run_all_UsdUtil_tests();
+void runAllUsdUtilTests();
diff --git a/cesiumOmniverseCppTestsExtension/public/CesiumOmniverseCppTests.cpp b/cesiumOmniverseCppTestsExtension/public/CesiumOmniverseCppTests.cpp
@@ -63,7 +63,7 @@ class CesiumOmniverseCppTestsPlugin final : public ICesiumOmniverseCppTestsInter
         Context::onShutdown();
     }
 
-    void run_all_tests(long int stage_id) noexcept override {
+    void runAllTests(long int stage_id) noexcept override {
 
         CESIUM_LOG_INFO("Running Cesium Omniverse Tests with stage id: {}", stage_id);
 
@@ -80,7 +80,7 @@ class CesiumOmniverseCppTestsPlugin final : public ICesiumOmniverseCppTestsInter
         context.setAssertHandler(handler);
 
         exampleTest();
-        run_all_UsdUtil_tests();
+        runAllUsdUtilTests();
 
         CESIUM_LOG_INFO("Cesium Omniverse Tests complete");
     }

diff --git a/cesiumOmniverseCppTestsExtension/public/UsdUtilTests.cpp b/cesiumOmniverseCppTestsExtension/public/UsdUtilTests.cpp
@@ -1,7 +1,3 @@
-// #define DOCTEST_CONFIG_IMPLEMENT
-// #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-// #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
 #include "UsdUtilTests.h"
 
 #include "cesium/omniverse/Context.h"
@@ -10,11 +6,10 @@
 
 #include <doctest/doctest.h>
 
-#include <iostream>
-
-void run_all_UsdUtil_tests() {
+void runAllUsdUtilTests() {
+    // CESIUM_LOG_INFO macro can only be run inside the cesium::omniverse namespace
     using namespace cesium::omniverse;
     CESIUM_LOG_INFO("Running UsdUtil Tests...");
-    CHECK(cesium::omniverse::UsdUtil::primExists(pxr::SdfPath("/Cesium")));
+    CHECK(UsdUtil::primExists(pxr::SdfPath("/Cesium")));
     CESIUM_LOG_INFO("UsdUtil Tests complete!");
 }