Test review pass

sts
om 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/mayaUsd/commands/mayaLayerEditorDCCFunctions.cpp

@@ -134,9 +134,6 @@ void registerLayerEditorDCCFunctions()
         return MayaUsd::ComponentUtils::previewSaveAdskUsdComponent(
             saveLocation, componentName, dccObjectPath);
     };
-    component.displayError = [](const std::string& error) {
-        MGlobal::displayError(error.c_str());
-    };
     component.getComponentLayersToSave = [](const std::string& dccObjectPath) {
         return MayaUsd::ComponentUtils::getAdskUsdComponentLayersToSave(dccObjectPath);
     };
@@ -254,6 +251,9 @@ void registerLayerEditorDCCFunctions()
             = PXR_NS::UsdMayaUtil::convert(MayaUsdOptionVars->LayerContentsTimeSamplesSizeLimit);
         return MGlobal::optionVarExists(k) ? MGlobal::optionVarIntValue(k) : 8;
     };
+    environment.displayError = [](const std::string& error) {
+        MGlobal::displayError(error.c_str());
+    };
     setEnvironmentFns(environment);
 
 #ifdef WANT_ADSK_USD_EDIT_FORWARD_BUILD

lib/usdLayerEditor/lib/layerEditorDCCFunctions.cpp

@@ -104,8 +104,8 @@ std::vector<std::string> getComponentLayersToSave(const std::string& dccObjectPa
 }
 void displayError(const std::string& error)
 {
-    if (registry().component.displayError)
-        registry().component.displayError(error);
+    if (registry().environment.displayError)
+        registry().environment.displayError(error);
 }
 PXR_NS::SdfLayerRefPtr captureSessionLayer(const std::string& dccObjectPath)
 {

lib/usdLayerEditor/lib/layerEditorDCCFunctions.h

@@ -76,7 +76,6 @@ struct ComponentFns
     MoveComponentFn                           moveComponent;
     PreviewComponentSaveFn                    previewComponentSave;
     GetComponentLayersToSaveFn                getComponentLayersToSave;
-    std::function<void(const std::string&)>   displayError; // no-op when unset
     CaptureSessionLayerFn                     captureSessionLayer;   // returns null when unset
     TransferSessionLayerFn                    transferSessionLayer;  // no-op when unset
     SetProxyRootLayerPathFn                   setProxyRootLayerPath; // no-op when unset
@@ -125,6 +124,7 @@ struct EnvironmentFns
     std::function<QWidget*()> mainWindowParent;           // default nullptr
     std::function<int64_t()>  layerContentsArraySizeLimit;       // default 8
     std::function<int64_t()>  layerContentsTimeSamplesSizeLimit; // default 8
+    std::function<void(const std::string&)> displayError;          // no-op when unset
 };
 
 struct FileSystemFns
@@ -183,7 +183,6 @@ moveComponent(const std::string&, const std::string&, const std::string&);
 LayerEditorAPI std::string
 previewComponentSave(const std::string&, const std::string&, const std::string&);
 LayerEditorAPI std::vector<std::string> getComponentLayersToSave(const std::string&);
-LayerEditorAPI void                     displayError(const std::string&);
 LayerEditorAPI PXR_NS::SdfLayerRefPtr captureSessionLayer(const std::string& dccObjectPath);
 LayerEditorAPI void transferSessionLayer(
     const PXR_NS::SdfLayerRefPtr& sourceSessionLayer,
@@ -226,6 +225,7 @@ LayerEditorAPI bool        shouldExpandOrCollapseAll();
 LayerEditorAPI QWidget*    mainWindowParent();
 LayerEditorAPI int64_t     layerContentsArraySizeLimit();
 LayerEditorAPI int64_t     layerContentsTimeSamplesSizeLimit();
+LayerEditorAPI void        displayError(const std::string&);
 
 // FileSystemFns
 LayerEditorAPI std::string getDCCSceneDir();

test/lib/oldUsdLayerEditor/cpp/stubCommandHook.h

@@ -63,6 +63,14 @@ class OldEditorStubCommandHook : public AbstractCommandHook
     bool               hasCall(const std::string& method) const;
     int                callCount(const std::string& method) const;
     const CommandCall& lastCall() const;
+    // Returns a pointer to the last call with the given name, or nullptr if none.
+    const CommandCall* lastCallOf(const std::string& method) const
+    {
+        for (auto it = _calls.rbegin(); it != _calls.rend(); ++it)
+            if (it->name == method)
+                return &*it;
+        return nullptr;
+    }
 
     std::vector<CommandCall> _calls;
 

test/lib/usdLayerEditor/cpp/stubCommandHook.h

@@ -54,6 +54,14 @@ class StubCommandHook : public AbstractCommandHook
     bool               hasCall(const std::string& method) const;
     int                callCount(const std::string& method) const;
     const CommandCall& lastCall() const;
+    // Returns a pointer to the last call with the given name, or nullptr if none.
+    const CommandCall* lastCallOf(const std::string& method) const
+    {
+        for (auto it = _calls.rbegin(); it != _calls.rend(); ++it)
+            if (it->name == method)
+                return &*it;
+        return nullptr;
+    }
 
     std::vector<CommandCall> _calls;
 

test/lib/usdLayerEditor/cpp/testButtonsLogic.cpp

@@ -45,6 +45,8 @@ class ButtonsSharedStageFixture : public LayerEditorTestFixture
 
 // Shared stage backed by a real file: root layer is non-anonymous and initially
 // clean, so the Save button starts disabled and only enables when dirty.
+// Not compiled for the old editor: switchToCustomStage is new-editor-only API.
+#ifndef MAYAUSD_OLD_LAYER_EDITOR
 class SaveStageCleanNonAnonFixture : public LayerEditorTestFixture
 {
 protected:
@@ -69,6 +71,7 @@ class SaveStageCleanNonAnonFixture : public LayerEditorTestFixture
         QFile::remove(_stagePath);
     }
 };
+#endif
 
 // Clicking "Add a New Layer" with nothing selected inserts an anonymous sublayer at the root.
 TEST_F(LayerEditorTestFixture, NewLayerButton_Click_CallsAddAnonymousSubLayer)
@@ -81,10 +84,9 @@ TEST_F(LayerEditorTestFixture, NewLayerButton_Click_CallsAddAnonymousSubLayer)
     btn->click();
     QApplication::processEvents();
 
-    ASSERT_TRUE(_sessionState._commandHookImpl.hasCall("addAnonymousSubLayer"))
-        << "addAnonymousSubLayer should have been called";
-    EXPECT_EQ(_sessionState._commandHookImpl.lastCall().args[0],
-              _sessionState.stage()->GetRootLayer()->GetIdentifier())
+    const auto* call = _sessionState._commandHookImpl.lastCallOf("addAnonymousSubLayer");
+    ASSERT_NE(call, nullptr) << "addAnonymousSubLayer should have been called";
+    EXPECT_EQ(call->args[0], _sessionState.stage()->GetRootLayer()->GetIdentifier())
         << "addAnonymousSubLayer should target the root layer when nothing is selected";
 }
 
@@ -173,10 +175,9 @@ TEST_F(LayerEditorTestFixture, NewLayerButton_Click_NoSelection_AddsToRoot)
     btn->click();
     QApplication::processEvents();
 
-    ASSERT_TRUE(_sessionState._commandHookImpl.hasCall("addAnonymousSubLayer"))
-        << "addAnonymousSubLayer should be called on root layer when nothing is selected";
-    EXPECT_EQ(_sessionState._commandHookImpl.lastCall().args[0],
-              _sessionState.stage()->GetRootLayer()->GetIdentifier())
+    const auto* call = _sessionState._commandHookImpl.lastCallOf("addAnonymousSubLayer");
+    ASSERT_NE(call, nullptr) << "addAnonymousSubLayer should be called on root layer when nothing is selected";
+    EXPECT_EQ(call->args[0], _sessionState.stage()->GetRootLayer()->GetIdentifier())
         << "parent should be the root layer when there is no selection";
 }
 
@@ -264,11 +265,10 @@ TEST_F(LayerEditorTestFixture, NewLayerButton_Click_WithSublayerSelectionAddsSib
     btn->click();
     QApplication::processEvents();
 
-    ASSERT_TRUE(_sessionState._commandHookImpl.hasCall("addAnonymousSubLayer"))
-        << "addAnonymousSubLayer should be called on the parent when adding a sibling";
     // Adding a sibling means inserting into the selected layer's parent (root).
-    EXPECT_EQ(_sessionState._commandHookImpl.lastCall().args[0],
-              _sessionState.stage()->GetRootLayer()->GetIdentifier())
+    const auto* call = _sessionState._commandHookImpl.lastCallOf("addAnonymousSubLayer");
+    ASSERT_NE(call, nullptr) << "addAnonymousSubLayer should be called on the parent when adding a sibling";
+    EXPECT_EQ(call->args[0], _sessionState.stage()->GetRootLayer()->GetIdentifier())
         << "parent should be the root layer when a direct sublayer of root is selected";
 }
 
@@ -284,6 +284,7 @@ TEST_F(LayerEditorTestFixture, ToolbarButtons_HaveObjectNames)
 // With a file-backed (non-anonymous), clean stage the Save button starts disabled.
 // Making the stage dirty must enable it — the transition proves the button actually
 // tracks needsSaving() rather than being permanently enabled by isAnonymous().
+#ifndef MAYAUSD_OLD_LAYER_EDITOR
 TEST_F(SaveStageCleanNonAnonFixture, SaveStageButton_DisabledInitially_EnabledWhenDirty)
 {
     QPushButton* btn = TestUtils::findButtonByTooltip(_widget, "Save all edits in the Layer Stack");
@@ -298,6 +299,7 @@ TEST_F(SaveStageCleanNonAnonFixture, SaveStageButton_DisabledInitially_EnabledWh
 
     EXPECT_TRUE(btn->isEnabled()) << "Save Stage button should be enabled after stage becomes dirty";
 }
+#endif
 
 // ── New Layer button: disabled → enabled transition ───────────────────────────
 

test/lib/usdLayerEditor/cpp/testContextMenuLogic.cpp

@@ -42,8 +42,9 @@ TEST_F(LayerEditorTestFixture, ContextMenu_AddAnonymousSublayer_CallsHook)
     _sessionState._commandHookImpl.clearCalls();
     _window->addAnonymousSublayer();
     QApplication::processEvents();
-    ASSERT_TRUE(_sessionState._commandHookImpl.hasCall("addAnonymousSubLayer"));
-    EXPECT_EQ(_sessionState._commandHookImpl.lastCall().args[0], item->layer()->GetIdentifier())
+    const auto* call = _sessionState._commandHookImpl.lastCallOf("addAnonymousSubLayer");
+    ASSERT_NE(call, nullptr) << "addAnonymousSubLayer should have been called";
+    EXPECT_EQ(call->args[0], item->layer()->GetIdentifier())
         << "addAnonymousSubLayer should target the selected layer";
 }
 

test/lib/usdLayerEditor/cpp/testEFModeLogic.cpp

@@ -107,8 +107,8 @@ TEST_F(LayerEditorWithEFFixture, EFMode_Button_Tooltip)
 
 // updateButtons() sets the button stylesheet to reflect EF active state.
 // The icon switches between ef_default (off) and ef_on (on) via background-image.
-// Runs for both editors when EF is compiled in (WANT_ADSK_USD_EDIT_FORWARD_BUILD).
-#ifdef WANT_ADSK_USD_EDIT_FORWARD_BUILD
+// New editor only: the old editor lacks the editForwardingChanged→updateButtons connection.
+#if defined(WANT_ADSK_USD_EDIT_FORWARD_BUILD) && !defined(MAYAUSD_OLD_LAYER_EDITOR)
 TEST_F(LayerEditorWithEFFixture, EFMode_Button_IconReflectsActiveState)
 {
     QPushButton* btn = TestUtils::findButtonByObjectName(_widget, "LayerEditorToggleEFButton");