Re-instated BasicRender and DagChanges unit tests. (#203)

* Re-instated BasicRender and DagChanges unit tests. * Attempt fix for macOS image comparison failure.
Autodesk · Nov 18, 2024 · 8db08d7 · 8db08d7
1 parent c2f4764
commit 8db08d7
Show file tree

Hide file tree

Showing 40 changed files with 162 additions and 88 deletions.
diff --git a/...Hydra/MtohBasicRenderTest/flat_orange.png → ...yaToHydra/BasicRenderTest/flat_orange.png b/...Hydra/MtohBasicRenderTest/flat_orange.png → ...yaToHydra/BasicRenderTest/flat_orange.png
diff --git a/...a/MtohBasicRenderTest/flat_orange_bad.png → ...Hydra/BasicRenderTest/flat_orange_bad.png b/...a/MtohBasicRenderTest/flat_orange_bad.png → ...Hydra/BasicRenderTest/flat_orange_bad.png
diff --git a/.../lambertDefaultMaterial/cube_selected.png → ...BasicRenderTest/lambert/cube_selected.png b/.../lambertDefaultMaterial/cube_selected.png → ...BasicRenderTest/lambert/cube_selected.png
diff --git a/...ambertDefaultMaterial/cube_unselected.png → ...sicRenderTest/lambert/cube_unselected.png b/...ambertDefaultMaterial/cube_unselected.png → ...sicRenderTest/lambert/cube_unselected.png
diff --git a/...ib/mayaUsd/render/mayaToHydra/BasicRenderTest/standardSurface/cube_selected.png b/...ib/mayaUsd/render/mayaToHydra/BasicRenderTest/standardSurface/cube_selected.png
diff --git a/.../mayaUsd/render/mayaToHydra/BasicRenderTest/standardSurface/cube_unselected.png b/.../mayaUsd/render/mayaToHydra/BasicRenderTest/standardSurface/cube_unselected.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -9,8 +9,8 @@ set(INTERACTIVE_TEST_SCRIPT_FILES
     testImageDiffing.py
     testMtohCommand.py
 # Fail as of 22-Feb-2023.  Entered as MAYA-127898.
-#    testMtohBasicRender.py
-#    testMtohDagChanges.py
+    testBasicRender.py
+    testDagChanges.py
     testMeshes.py
     testNamespaces.py
     testVisibility.py

diff --git a/...oHydra/MtohDagChangesTest/instances_0.png → ...ra/DagChangesTest/lambert/instances_0.png b/...oHydra/MtohDagChangesTest/instances_0.png → ...ra/DagChangesTest/lambert/instances_0.png
diff --git a/...st/lambertDefaultMaterial/instances_1.png → ...ra/DagChangesTest/lambert/instances_1.png b/...st/lambertDefaultMaterial/instances_1.png → ...ra/DagChangesTest/lambert/instances_1.png
diff --git a/...t/lambertDefaultMaterial/instances_12.png → ...a/DagChangesTest/lambert/instances_12.png b/...t/lambertDefaultMaterial/instances_12.png → ...a/DagChangesTest/lambert/instances_12.png
diff --git a/.../lambertDefaultMaterial/instances_123.png → .../DagChangesTest/lambert/instances_123.png b/.../lambertDefaultMaterial/instances_123.png → .../DagChangesTest/lambert/instances_123.png
diff --git a/...lambertDefaultMaterial/instances_1234.png → ...DagChangesTest/lambert/instances_1234.png b/...lambertDefaultMaterial/instances_1234.png → ...DagChangesTest/lambert/instances_1234.png
diff --git a/...mbertDefaultMaterial/instances_123456.png → ...gChangesTest/lambert/instances_123456.png b/...mbertDefaultMaterial/instances_123456.png → ...gChangesTest/lambert/instances_123456.png
diff --git a/...lambertDefaultMaterial/instances_1235.png → ...DagChangesTest/lambert/instances_1235.png b/...lambertDefaultMaterial/instances_1235.png → ...DagChangesTest/lambert/instances_1235.png
diff --git a/...st/lambertDefaultMaterial/instances_3.png → ...ra/DagChangesTest/lambert/instances_3.png b/...st/lambertDefaultMaterial/instances_3.png → ...ra/DagChangesTest/lambert/instances_3.png
diff --git a/...t/lambertDefaultMaterial/instances_35.png → ...a/DagChangesTest/lambert/instances_35.png b/...t/lambertDefaultMaterial/instances_35.png → ...a/DagChangesTest/lambert/instances_35.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_0.png b/test/lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_0.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_1.png b/test/lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_1.png
diff --git a/.../lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_12.png b/.../lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_12.png
diff --git a/...lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_123.png b/...lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_123.png
diff --git a/...ib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_1234.png b/...ib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_1234.png
diff --git a/.../mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_123456.png b/.../mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_123456.png
diff --git a/...ib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_1235.png b/...ib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_1235.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_3.png b/test/lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_3.png
diff --git a/.../lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_35.png b/.../lib/mayaUsd/render/mayaToHydra/DagChangesTest/standardSurface/instances_35.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_selected.png b/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_selected.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_unselected.png b/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_unselected.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_12.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_12.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1234.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1234.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123456.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123456.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1235.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1235.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_3.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_3.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_35.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_35.png
diff --git a/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_0.png b/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_0.png
diff --git a/...render/mayaToHydra/testMtohBasicRender.py → ...Usd/render/mayaToHydra/testBasicRender.py b/...render/mayaToHydra/testMtohBasicRender.py → ...Usd/render/mayaToHydra/testBasicRender.py
@@ -20,7 +20,14 @@
 import fixturesUtils
 import mtohUtils
 
-class TestSnapshot(mtohUtils.MayaHydraBaseTestCase):
+from string import digits
+
+class BasicRenderBaseTestCase(mtohUtils.MayaHydraBaseTestCase):
+
+    IMAGE_DIFF_FAIL_THRESHOLD = 0.01
+    IMAGE_DIFF_FAIL_PERCENT = 0.2
+
+class TestSnapshot(BasicRenderBaseTestCase):
     """Tests whether our snapshot rendering works with basic Viewport 2.0"""
 
     _file = __file__
@@ -49,22 +56,27 @@ def test_flat_orange(self):
         cmds.setAttr('persp.rotate', 0, 0, 0, type='float3')
         cmds.setAttr('persp.translate', 0, .25, .7, type='float3')
 
-        self.assertSnapshotEqual("flat_orange.png")
-        self.assertRaises(AssertionError,
-                          self.assertSnapshotEqual, "flat_orange_bad.png")        
+        self.assertSnapshotClose(
+            "flat_orange.png", self.IMAGE_DIFF_FAIL_THRESHOLD,
+            self.IMAGE_DIFF_FAIL_PERCENT)
+        self.assertRaises(
+            AssertionError, self.assertSnapshotClose, "flat_orange_bad.png",
+            self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
 
-class TestMayaHydraRender(mtohUtils.MayaHydraBaseTestCase):
+class TestMayaHydraRender(BasicRenderBaseTestCase):
     _file = __file__
 
     def test_cube(self):
-        imageVersion = None
-        if maya.mel.eval("defaultShaderName") != "standardSurface1":
-            imageVersion = 'lambertDefaultMaterial'
+        imageVersion = maya.mel.eval("defaultShaderName").rstrip(digits)
 
         self.makeCubeScene(camDist=6)
-        self.assertSnapshotEqual("cube_unselected.png", imageVersion)
+        self.assertSnapshotClose(
+            "cube_unselected.png", self.IMAGE_DIFF_FAIL_THRESHOLD,
+            self.IMAGE_DIFF_FAIL_PERCENT, imageVersion)
         cmds.select(self.cubeTrans)
-        self.assertSnapshotEqual("cube_selected.png", imageVersion)
+        self.assertSnapshotClose(
+            "cube_selected.png", self.IMAGE_DIFF_FAIL_THRESHOLD,
+            self.IMAGE_DIFF_FAIL_PERCENT, imageVersion)
 
 
 if __name__ == '__main__':