Decouple old tests from shared LE

876036 -0400

Merge remote-tracking branch 'upstream/dev' into deboisj/unify_layer_editor_review
kQACksGu6ycD7dV7/lRp4Guvvj
 KVCsT9UwEthfdkPDMfa7G3i+9GSacK733THUcJppZK+4DM2m8PbSiP0pj/dSaElf
 iaICFZ7H2KJ6tTashv3bQPy6Z7mn4slht5L+66l+D4rWifT8QB1CXj2z2cgZ+2NX
 oc1LH6nKO6HKmq8crOB63Yb8O81jLOWCJoYt40nrlxy1SWqIJpMNnV2mj+1xAnUI
 9n1h3qJb4+Jauu4zH+JPds/dewJ+3sLwKSF5q8BdLb8XmHckHG2ajvXmpZAJg6Rk
 vtkQDip8Viem0NpWOsVRVuQxOeqLs1UXhZt5e3bZ5txHR5L5PiHeb0rrphZ7b57w
 50zBFPlKnP/+noIbMBtPBSUkw9B0lQFNVvxjamQic2Zga23J5+dcJ1Qf9J1tVbf+
 hDOY1r3vxFU1PnDPvJjTgsA0ATH+P33Z1wQ4lYNaENo2iT+nbccq/fOusSNzsBdl
 iK2auWyxHX4P21ZpsZlICRgSkUn68Ncn0dJIUA6grewUAGxoBGkGHQ17FTTxWtXe
 XaZ3WpikFeNcRS89DayGpcjnj9UzSco2L0ZrudCLh/ltNDrxlk4tpQQrMep+0aI+
 B/oIBncZS8y4IZAKdDm5pqJtGaYulqwYHAXL41QyAv/QEg+sA20KLSRKVIaQz7CK
 kq12Y3YgiDpN7fbCmJx/
 =2NPd
 -----END PGP SIGNATURE-----
 

Merge pull request #4651 from Autodesk/barbalt/dev/EMSUSD-3311-remove-opinion

EMSUSD-3311 - Add remove opinion + undoENEITEM_HAS_METADATA is no…both unchanged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
hropic.com>

Author: deboisj

lib/usd/ui/layerEditor/mayaQtUtils.cpp

@@ -18,7 +18,9 @@
 
 #include "mayaLayerEditorUi.h"
 
+#if defined(MAYAUSD_USE_SHARED_LAYER_EDITOR)
 #include <layerEditorDCCFunctions.h>
+#endif
 
 #include <maya/MQtUtil.h>
 

test/lib/CMakeLists.txt

@@ -163,13 +163,15 @@ endforeach()
 
 #
 # -----------------------------------------------------------------------------
-# Shared usdLayerEditor component tests (C++ GTests + Maya Python interactive test).
+# Shared usdLayerEditor component tests (C++ GTests + UFE commands python tests).
 # -----------------------------------------------------------------------------
 add_subdirectory(usdLayerEditor)
 
 #
 # -----------------------------------------------------------------------------
 # Old layer editor parity tests — temporary, deleted when old editor is retired.
+# Reuse the shared layer editor test sources against the old editor; coverage is
+# lesser than the new editor suite.
 # -----------------------------------------------------------------------------
 add_subdirectory(oldUsdLayerEditor)
 

test/lib/oldUsdLayerEditor/CMakeLists.txt

@@ -15,7 +15,7 @@
 #
 
 # Old layer editor parity test suite. Temporary — deleted when the old editor
-# is retired. See cpp/PARITY_STATUS.md for test coverage details.
+# is retired.
 
 add_subdirectory(cpp)
 
@@ -27,8 +27,6 @@ mayaUsd_add_test(${target}
         "LD_LIBRARY_PATH=${ADDITIONAL_LD_LIBRARY_PATH}"
         "MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/lib/maya"
 )
-set_property(TEST ${target} APPEND PROPERTY LABELS MayaUsdOldLEParity)
-
 install(FILES testOldLayerEditorParity.py
     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tests
 )

test/lib/oldUsdLayerEditor/cpp/CMakeLists.txt

@@ -22,12 +22,7 @@ set(CMAKE_AUTORCC ON)
 set(NEW_LE_TEST_CPP
     ${CMAKE_CURRENT_SOURCE_DIR}/../../usdLayerEditor/cpp)
 
-# layerEditorDCCFunctions.h lives in the shared lib; the *Logic.cpp sources use
-# ScopedLayerEditorDCCFunctions which includes it transitively.
-set(NEW_LE_LIB
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lib/usdLayerEditor/lib)
-
-# ── Sources ────────────────────────────────────────────────────────────────────
+# Sources
 set(OLD_LE_OWN_SOURCES
     stubCommandHook.cpp
     stubSessionState.cpp
@@ -65,12 +60,6 @@ set(OLD_LE_SHARED_LOGIC_SOURCES
     ${NEW_LE_TEST_CPP}/testUsdSyntaxHighlighterLogic.cpp
 )
 
-# layerEditorDCCFunctions is compiled directly (not via UsdLayerEditorLib link)
-# to keep the registry self-contained inside this test DLL, avoiding ODR issues.
-set(DCC_FN_SOURCES
-    ${NEW_LE_LIB}/layerEditorDCCFunctions.cpp
-)
-
 # Legacy widget sources compiled directly into this test DLL. This gives the
 # test a self-contained copy of the old editor, avoiding ODR conflicts with
 # UsdLayerEditorLib, which exports the new editor's versions of the same classes.
@@ -97,18 +86,20 @@ set(LEGACY_SOURCES
     ${CMAKE_SOURCE_DIR}/lib/usd/ui/layerEditor/warningDialogs.cpp
 )
 
+# The legacy layerEditorWidget.cpp above opens the edit-forward dialog, so its
+# definition must be compiled in when edit-forward is available; exercised by
+# the shared testEFModeLogic.cpp cases.
 if(AdskUsdEditForward_FOUND)
     list(APPEND LEGACY_SOURCES
         ${CMAKE_SOURCE_DIR}/lib/usd/ui/editForward/editForwardDialog.cpp)
 endif()
 
-# ── Target ─────────────────────────────────────────────────────────────────────
+# Target
 set(TARGET_NAME mayaUsdOldLayerEditorTests)
 
 add_library(${TARGET_NAME} SHARED
     ${OLD_LE_OWN_SOURCES}
     ${OLD_LE_SHARED_LOGIC_SOURCES}
-    ${DCC_FN_SOURCES}
     ${LEGACY_SOURCES}
 )
 
@@ -134,14 +125,12 @@ target_compile_definitions(${TARGET_NAME}
 # Include path order is critical:
 #   1. OLD editor test dir FIRST — shim headers shadow new editor versions.
 #   2. NEW editor test dir SECOND — *Logic.h headers and testUtils.h.
-#   3. OLD editor lib THIRD — abstractCommandHook.h etc. must shadow the new lib versions.
-#   4. NEW editor lib LAST — layerEditorDCCFunctions.h, only resolved if not found above.
+#   3. OLD editor lib LAST — abstractCommandHook.h etc. must shadow the new lib versions.
 target_include_directories(${TARGET_NAME}
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${NEW_LE_TEST_CPP}
         ${CMAKE_SOURCE_DIR}/lib/usd/ui/layerEditor
-        ${NEW_LE_LIB}
 )
 
 target_link_libraries(${TARGET_NAME}

test/lib/oldUsdLayerEditor/cpp/testFixture.cpp

@@ -14,7 +14,6 @@
 //
 #include "testFixture.h"
 
-#include "layerEditorDCCFunctions.h"
 #include "warningDialogs.h"
 
 #include <QtWidgets/QApplication>
@@ -31,48 +30,6 @@ namespace UsdLayerEditor {
 
 void LayerEditorTestFixture::SetUp()
 {
-    EditForwardingFns ef;
-    ef.supportsEditForwarding = [this]() { return _efSupported; };
-    ef.echoEditForwarding     = []() { return false; };
-    ef.setEchoEditForwarding  = [](bool) {};
-    setEditForwardingFns(ef);
-
-    DccObjectFns dcc;
-    dcc.isDccObjectStageIncoming = [this](const std::string&) { return _stageIncoming; };
-    dcc.isDccObjectSharedStage   = [this](const std::string&) { return _sharedStage; };
-    setDccObjectFns(dcc);
-
-    ComponentFns component;
-    component.isStageAComponent
-        = [this](const std::string&) { return _isComponent; };
-    component.isUnsavedComponent
-        = [this](const PXR_NS::UsdStageRefPtr&) { return _isUnsavedComponent; };
-    component.shouldDisplayComponentInitialSaveDialog
-        = [](const PXR_NS::UsdStageRefPtr&, const std::string&) { return false; };
-    component.saveComponent
-        = [this](const PXR_NS::UsdStageRefPtr&, const std::string&) { ++_saveComponentCalls; };
-    component.reloadComponent
-        = [this](const std::string&) { ++_reloadComponentCalls; };
-    component.moveComponent
-        = [this](const std::string&, const std::string&, const std::string&) {
-              return _moveComponentResult;
-          };
-    component.renameProxyShape
-        = [](const std::string&, const std::string& name) { return std::string("|") + name; };
-    component.captureSessionLayer
-        = [](const std::string&) { return PXR_NS::SdfLayerRefPtr {}; };
-    component.transferSessionLayer
-        = [this](const PXR_NS::SdfLayerRefPtr&, const std::string&) { ++_transferSessionCalls; };
-    component.setProxyRootLayerPath
-        = [this](const std::string&, const std::string&, const PXR_NS::SdfLayerRefPtr&) {
-              ++_setProxyRootPathCalls;
-          };
-    setComponentFns(component);
-
-    SaveOptionFns saveOption;
-    saveOption.confirmExistingFileSave = [this]() { return _confirmExistingFileSave; };
-    setSaveOptionFns(saveOption);
-
     setModalDialogTestHandler([this](const QString&, const QString&) {
         ++_modalDialogCount;
         return _modalDialogAnswer;

test/lib/oldUsdLayerEditor/cpp/testFixture.h

@@ -14,7 +14,6 @@
 //
 #pragma once
 
-#include "scopedLayerEditorDCCFunctions.h"
 #include "stubCommandHook.h"
 #include "stubLayerEditorWindow.h"
 #include "stubSessionState.h"
@@ -49,35 +48,26 @@ class LayerEditorTestFixture : public ::testing::Test
     void setSharedStage(bool shared) { _sessionState._commandHookImpl._isSharedStage = shared; }
     void setStageIncoming(bool incoming) { _sessionState._commandHookImpl._isStageIncoming = incoming; }
 
-    // Members — names must match new editor's testFixture.h exactly
+    // Members mirror the new editor's testFixture.h, named identically so the
+    // shared *Logic.cpp sources compile unchanged. Only those the old editor
+    // actually exercises are kept; members feeding the new editor's DCC registry
+    // are referenced solely by MAYAUSD_OLD_LAYER_EDITOR-guarded test code.
     OldEditorStubSessionState                        _sessionState;
     std::unique_ptr<OldEditorStubLayerEditorWindow>  _window;
     QMainWindow*                                     _mainWindow { nullptr };
     LayerEditorWidget*                               _widget { nullptr };
 
-    bool        _efSupported   { false };
-    bool        _sharedStage   { false };
-    bool        _stageIncoming { false };
-
-    bool        _isComponent        { false };
-    bool        _isUnsavedComponent { false };
-    std::string _moveComponentResult;
-    int         _saveComponentCalls      { 0 };
-    int         _reloadComponentCalls    { 0 };
-    int         _transferSessionCalls    { 0 };
-    int         _setProxyRootPathCalls   { 0 };
+    bool _isComponent        { false };
+    bool _isUnsavedComponent { false };
 
     int  _modalDialogCount  { 0 };
     bool _modalDialogAnswer { true };
-    bool _confirmExistingFileSave { false };
     // Real Maya proxy shape DAG paths, e.g. "|leTestXform0|leTestProxy0".
     // Set in SetUp, cleared in TearDown.
     std::string _proxyShapePaths[2];
     // Temp .usda files backing the proxy shapes — deleted in TearDown.
     std::string _tempStagePaths[2];
 
-    ScopedLayerEditorDCCFunctions _scopedDCCFunctions;
-
     void setIsComponent(bool v)        { _isComponent = v; }
     void setIsUnsavedComponent(bool v) { _isUnsavedComponent = v; }
 };

test/lib/usdLayerEditor/cpp/testLayerLogicUtilsLogic.cpp

@@ -15,7 +15,11 @@
 // limitations under the License.
 //
 #include "customLayerData.h"
+#ifndef MAYAUSD_OLD_LAYER_EDITOR
+// Layers:: utilities live in UsdLayerEditorLib, which the old editor test binary
+// does not link; only the guarded LayersTest cases below use them.
 #include "layers.h"
+#endif
 #include "warningDialogs.h"
 
 #include <pxr/base/tf/token.h>

test/lib/usdLayerEditor/cpp/testLayerTreeItemLogic.cpp

@@ -398,11 +398,16 @@ TEST_F(LayerTreeItemTest, IsIdenticalItem_DifferentLayerReturnsFalse)
 // (SessionState::saveLayerUI), which the stub records via _saveLayerCallCount.
 TEST_F(LayerTreeItemTest, SaveAnonymousLayer_NonComponentStage_UsesGenericPath)
 {
+#ifndef MAYAUSD_OLD_LAYER_EDITOR
+    // Configures the new editor's component early-out to treat the stage as a
+    // non-component. The old editor has no such early-out and ignores the DCC
+    // registry, so this setup is omitted there (and the registry isn't linked).
     ScopedLayerEditorDCCFunctions guard;
     ComponentFns                  comp;
     comp.displayError = [](const std::string&) {};
     comp.isStageAComponent = [](const std::string&) { return false; };
     setComponentFns(comp);
+#endif
 
     auto* item = itemAt(treeModel(), firstSublayerIndex());
     ASSERT_NE(item, nullptr);