Enable the merging scene index test and add test for removing input scenes.

Author: cameronwhite

pxr/imaging/hd/CMakeLists.txt

@@ -334,6 +334,16 @@ pxr_build_test(testHdDataSource
        testenv/testHdDataSource.cpp
 )
 
+pxr_build_test(testHdMergingSceneIndex
+   LIBRARIES
+       hd
+       sdf
+       tf
+
+   CPPFILES
+       testenv/testHdMergingSceneIndex.cpp
+)
+
 pxr_build_test(testHdSceneIndex
    LIBRARIES
        hd
@@ -437,6 +447,10 @@ pxr_register_test(testHdDataSource
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdDataSource"
 )
 
+pxr_register_test(testHdMergingSceneIndex
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdMergingSceneIndex"
+)
+
 pxr_register_test(testHdSceneIndex
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdSceneIndex"
 )

pxr/imaging/hd/testenv/testHdMergingSceneIndex.cpp

@@ -8,26 +8,14 @@
 #include "pxr/imaging/hd/api.h"
 #include "pxr/imaging/hd/filteringSceneIndex.h"
 #include "pxr/imaging/hd/mergingSceneIndex.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
 #include "pxr/imaging/hd/retainedSceneIndex.h"
 
 #include "pxr/base/tf/declarePtrs.h"
 
 #include <iostream>
 
-template <typename T>
-bool
-_CompareValue(const char* msg, const T& v1, const T& v2)
-{
-    if (v1 == v2) {
-        std::cout << msg << " matches." << std::endl;
-    }
-    else {
-        std::cerr << msg << " doesn't match. Expecting " << v2 << " got " << v1
-                  << std::endl;
-        return false;
-    }
-    return true;
-}
+PXR_NAMESPACE_USING_DIRECTIVE
 
 TF_DECLARE_REF_PTRS(_MySceneIndex);
 
@@ -53,6 +41,21 @@ operator<<(std::ostream& out, const std::vector<T>& v)
     return out;
 }
 
+template <typename T>
+bool
+_CompareValue(const char* msg, const T& v1, const T& v2)
+{
+    if (v1 == v2) {
+        std::cout << msg << " matches." << std::endl;
+    }
+    else {
+        std::cerr << msg << " doesn't match. Expecting " << v2 << " got " << v1
+                  << std::endl;
+        return false;
+    }
+    return true;
+}
+
 class _MySceneIndex final : public HdSingleInputFilteringSceneIndexBase
 {
 public:
@@ -225,6 +228,47 @@ _TestNoticesAfterRemove()
         });
 }
 
+static bool
+_TestRemoveInputScenes()
+{
+    const TfToken primType("PrimType");
+    auto dataSource = HdRetainedContainerDataSource::New();
+
+    HdRetainedSceneIndexRefPtr siA = HdRetainedSceneIndex::New();
+    siA->AddPrims({ { SdfPath("/A/B/C/D/E/F"), primType, dataSource },
+                    { SdfPath("/A/B/C/D2"), primType, dataSource } });
+
+    HdRetainedSceneIndexRefPtr siB = HdRetainedSceneIndex::New();
+    siB->AddPrims({ { SdfPath("/A/B/C/D"), primType, dataSource } });
+
+    HdRetainedSceneIndexRefPtr siC = HdRetainedSceneIndex::New();
+    siC->AddPrims({ { SdfPath("/A/B/C"), primType, dataSource } });
+
+    HdMergingSceneIndexRefPtr mergingSceneIndex = HdMergingSceneIndex::New();
+    mergingSceneIndex->AddInputScene(siA, SdfPath("/A/B"));
+    mergingSceneIndex->AddInputScene(siB, SdfPath("/A/B/C"));
+    mergingSceneIndex->AddInputScene(siC, SdfPath::AbsoluteRootPath());
+
+    _Logger logger;
+    mergingSceneIndex->AddObserver(HdSceneIndexObserverPtr(&logger));
+
+    mergingSceneIndex->RemoveInputScenes({siA, siB});
+
+    auto logEntries = logger.GetLog();
+
+    return _CompareValue(
+        "NOTICES", logEntries,
+        {
+            _LogEntry("remove", "/A/B/C/D/E"),
+            _LogEntry("remove", "/A/B/C/D2"),
+            _LogEntry("add", "/A/B"),
+            _LogEntry("add", "/A/B/C"),
+            _LogEntry("add", "/A/B/C/D"),
+            _LogEntry("remove", "/A/B/C/D"),
+            _LogEntry("add", "/A/B/C"),
+        });
+}
+
 #define xstr(s) str(s)
 #define str(s) #s
 #define TEST(X)                                                                \
@@ -244,6 +288,7 @@ main(int argc, char** argv)
 
     int i = 0;
     TEST(_TestNoticesAfterRemove);
+    TEST(_TestRemoveInputScenes);
 
     //-------------------------------------------------------------------------
     std::cout << "DONE testHdMergingSceneIndex" << std::endl;