From 02c65c1cb0df243bb8f58020b39fb7457d89e50f Mon Sep 17 00:00:00 2001
From: Julien Frantz <frantzy@illum-mg.fr>
Date: Wed, 9 Oct 2024 11:20:23 +0200
Subject: [PATCH] Fix testVP2RenderDelegateUSDPreviewSurface for maya 2022 (ufe
 v2).

---
 .../testVP2RenderDelegateUSDPreviewSurface.py         | 11 ++++++-----
 .../UsdPreviewSurface/TestOpacityThreshold.usda       | 10 ----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateUSDPreviewSurface.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateUSDPreviewSurface.py
index 8b15a9bb23..caf7eefdbf 100644
--- a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateUSDPreviewSurface.py
+++ b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateUSDPreviewSurface.py
@@ -279,11 +279,13 @@ def testOpacityThreshold(self):
         cmds.file(new=True, force=True)
         mayaUtils.loadPlugin('mayaUsdPlugin')
 
-        # Import the USD file and the maya camera for the snapshot.
+        # Import the USD file.
         testFile = testUtils.getTestScene('UsdPreviewSurface', 'TestOpacityThreshold.usda')
-        stageShapeNode, _ = mayaUtils.createProxyFromFile(testFile)
-        mayaUsdLib.PrimUpdaterManager.editAsMaya(stageShapeNode + ",/scene/camera")
-        testCamera = cmds.ls(sl=True)[0]
+        mayaUtils.createProxyFromFile(testFile)
+        
+        # Frame the scene for the snapshot.
+        cmds.xform("persp", t= (0, 1, 2.25))
+        cmds.xform("persp", ro=[-25, 0, 0], ws=True)
 
         # Create a light to cast a shadow.
         white_light = cmds.directionalLight(rgb=(1, 1, 1))
@@ -294,7 +296,6 @@ def testOpacityThreshold(self):
         cmds.modelEditor(
             mayaUtils.activeModelPanel(),
             edit=True,
-            camera=testCamera,
             displayTextures=True,
             displayLights='all',
             shadows=True,
diff --git a/test/testSamples/UsdPreviewSurface/TestOpacityThreshold.usda b/test/testSamples/UsdPreviewSurface/TestOpacityThreshold.usda
index 9eb9896999..c1bf3aa97c 100644
--- a/test/testSamples/UsdPreviewSurface/TestOpacityThreshold.usda
+++ b/test/testSamples/UsdPreviewSurface/TestOpacityThreshold.usda
@@ -7,16 +7,6 @@
 
 def Scope "scene"
 {
-    def Camera "camera"
-    {
-        float focalLength = 35
-        float horizontalAperture = 35.999928
-        float verticalAperture = 23.999952
-        float xformOp:rotateX = -25
-        double3 xformOp:translate = (0, 1, 2.25)
-        uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateX"]
-    }
-
     def Scope "geo"
     {
         def "opacityThreshold_000" (