added cleanup of prims

tests/include/UsdUtilTests.h

@@ -2,4 +2,5 @@
 
 namespace cesium::omniverse::UsdUtil {
 void setUpUsdUtilTests(long int stage_id);
+void cleanUpUsdUtilTests();
 }

tests/src/CesiumOmniverseCppTests.cpp

@@ -66,6 +66,7 @@ class CesiumOmniverseCppTestsPlugin final : public ICesiumOmniverseCppTestsInter
 
     void cleanUpAfterTests() noexcept {
         // delete any test related prims here
+        cesium::omniverse::UsdUtil::cleanUpUsdUtilTests();
     }
 };
 

tests/src/UsdUtilTests.cpp

@@ -1,6 +1,7 @@
 #include "UsdUtilTests.h"
 
 #include "CesiumUsdSchemas/data.h"
+#include "CesiumUsdSchemas/georeference.h"
 #include "testUtils.h"
 
 #include "cesium/omniverse/Context.h"
@@ -14,15 +15,17 @@
 #include <pxr/usd/usdGeom/xformable.h>
 #include <unistd.h>
 
+// define prim paths globally to cut down on repeated definitions
+// name the paths after the function to be tested so they can easily be paired up later
 pxr::SdfPath defineCesiumDataPath;
 pxr::SdfPath defineCesiumSessionPath;
 pxr::SdfPath defineCesiumGeoreferencePath;
 pxr::SdfPath defineCesiumTilesetPath;
 pxr::SdfPath defineCesiumImageryPath;
 pxr::SdfPath defineGlobeAnchorPath;
-pxr::SdfPath getOrCreateCesiumDataPath;
-pxr::SdfPath getOrCreateCesiumSessionPath;
-pxr::SdfPath getOrCreateCesiumGeoreferencePath;
+pxr::CesiumData getOrCreateCesiumDataPrim;
+pxr::CesiumSession getOrCreateCesiumSessionPrim;
+pxr::CesiumGeoreference getOrCreateCesiumGeoreferencePrim;
 
 namespace cesium::omniverse::UsdUtil {
 void setUpUsdUtilTests(long int stage_id) {
@@ -32,7 +35,7 @@ void setUpUsdUtilTests(long int stage_id) {
     auto stage = getUsdStage();
     auto rootPath = getRootPath();
 
-    // name the prims after the function to be tested so they can easily be paired up later
+    // might as well name the prims after the function as well, to ensure uniqueness and clarity
     defineCesiumDataPath = rootPath.AppendChild(pxr::TfToken("defineCesiumData"));
     defineCesiumSessionPath = rootPath.AppendChild(pxr::TfToken("defineCesiumSession"));
     defineCesiumGeoreferencePath = rootPath.AppendChild(pxr::TfToken("defineCesiumGeoreference"));
@@ -46,6 +49,30 @@ void setUpUsdUtilTests(long int stage_id) {
     defineCesiumTileset(defineCesiumTilesetPath);
     defineCesiumImagery(defineCesiumImageryPath);
     // defineGlobeAnchor(globeAnchorPath);
+
+    getOrCreateCesiumDataPrim = getOrCreateCesiumData();
+    getOrCreateCesiumSessionPrim = getOrCreateCesiumSession();
+    getOrCreateCesiumGeoreferencePrim = getOrCreateCesiumGeoreference();
+}
+
+void cleanUpUsdUtilTests() {
+
+    auto stage = getUsdStage();
+    auto rootPath = getRootPath();
+
+    // might as well name the prims after the function as well, to ensure uniqueness and clarity
+    stage->RemovePrim(defineCesiumDataPath);
+    stage->RemovePrim(defineCesiumSessionPath);
+    stage->RemovePrim(defineCesiumGeoreferencePath);
+    stage->RemovePrim(defineCesiumImageryPath);
+    stage->RemovePrim(defineCesiumTilesetPath);
+    stage->RemovePrim(defineGlobeAnchorPath);
+
+    // stage->RemovePrim(globeAnchorPath);
+
+    stage->RemovePrim(getOrCreateCesiumDataPrim.GetPath());
+    stage->RemovePrim(getOrCreateCesiumSessionPrim.GetPath());
+    stage->RemovePrim(getOrCreateCesiumGeoreferencePrim.GetPath());
 }
 
 TEST_SUITE("UsdUtil tests") {
@@ -128,6 +155,10 @@ TEST_SUITE("UsdUtil tests") {
         CHECK(isCesiumTileset(defineCesiumTilesetPath));
         CHECK(isCesiumImagery(defineCesiumImageryPath));
         // CHECK(hasCesiumGlobeAnchor(globeAnchorPath));
+
+        CHECK(isCesiumData(getOrCreateCesiumDataPrim.GetPath()));
+        CHECK(isCesiumSession(getOrCreateCesiumSessionPrim.GetPath()));
+        CHECK(isCesiumGeoreference(getOrCreateCesiumGeoreferencePrim.GetPath()));
     }
 
     TEST_CASE("Smoke tests") {
@@ -136,8 +167,10 @@ TEST_SUITE("UsdUtil tests") {
         CHECK_NOTHROW(getDynamicTextureProviderAssetPathToken("foo"));
         CHECK_NOTHROW(getFabricStageReaderWriter());
         CHECK_NOTHROW(getFabricStageReaderWriterId());
+        CHECK_NOTHROW(getUsdUpAxis());
+        CHECK(getUsdMetersPerUnit() > 0);
 
-        // hasStage();
+        // List of currently untested functions in UsdUtil:
         // usdToGlmVector(const pxr::GfVec3d& vector);
         // glmToUsdVector(const glm::dvec3& vector);
         // glmToUsdVector(const glm::fvec2& vector);
@@ -146,8 +179,6 @@ TEST_SUITE("UsdUtil tests") {
         // glmToUsdQuat(const glm::dquat& quat);
         // glmToUsdMatrixDecomposed(const glm::dmat4& matrix);
         // computeUsdWorldToLocalTransform(const pxr::SdfPath& path);
-        // getUsdUpAxis();
-        // getUsdMetersPerUnit();
         // computeEcefToUsdLocalTransform(const CesiumGeospatial::Cartographic& origin);
         // computeEcefToUsdWorldTransformForPrim(
         //     const CesiumGeospatial::Cartographic& origin, const pxr::SdfPath& primPath);
@@ -161,11 +192,7 @@ TEST_SUITE("UsdUtil tests") {
         //     const CesiumGeospatial::Cartographic& origin, const pxr::SdfPath& primPath, const Viewport& viewport);
         // computeWorldExtent(const pxr::GfRange3d& localExtent, const glm::dmat4& localToUsdTransform);
         // getEulerAnglesFromQuaternion(const pxr::GfQuatf& quaternion);
-
-        // primExists(const pxr::SdfPath& path);
-
         // setGeoreferenceForTileset(const pxr::SdfPath& tilesetPath, const pxr::SdfPath& georeferencePath);
-
         // addOrUpdateTransformOpForAnchor(const pxr::SdfPath& path, const glm::dmat4& transform);
         // getCesiumTransformOpValueForPathIfExists(const pxr::SdfPath& path);
         // getAnchorGeoreferencePath(const pxr::SdfPath& path);