add the correct paths for Light component test and use the 'Base' level instead of 'auto_test' level to resolve remaining issues with screenshot angles

Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>

AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py

@@ -69,7 +69,7 @@ def create_screenshots_archive(screenshot_path):
 
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("launcher_platform", ["windows_editor"])
-@pytest.mark.parametrize("level", ["auto_test"])
+@pytest.mark.parametrize("level", ["Base"])
 class TestAllComponentsIndepthTests(object):
 
     @pytest.mark.parametrize("screenshot_name", ["AtomBasicLevelSetup.ppm"])
@@ -91,10 +91,7 @@ class TestAllComponentsIndepthTests(object):
             "Viewport is set to the expected size: True",
             "Exited game mode"
         ]
-        unexpected_lines = [
-            "Traceback (most recent call last):",
-            "Screenshot failed"
-        ]
+        unexpected_lines = ["Traceback (most recent call last):"]
 
         hydra.launch_and_validate_results(
             request,
@@ -149,12 +146,7 @@ class TestAllComponentsIndepthTests(object):
             golden_images.append(golden_image_path)
 
         expected_lines = ["spot_light Controller|Configuration|Shadows|Shadowmap size: SUCCESS"]
-        unexpected_lines = [
-            "Trace::Assert",
-            "Trace::Error",
-            "Traceback (most recent call last):",
-            "Screenshot failed",
-        ]
+        unexpected_lines = ["Traceback (most recent call last):"]
         hydra.launch_and_validate_results(
             request,
             TEST_DIRECTORY,

AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py

@@ -116,29 +116,11 @@ def create_basic_atom_level(level_name):
 
     helper = EditorTestHelper(log_prefix="Atom_EditorTestHelper")
 
-    # Create a new level.
-    new_level_name = level_name
-    heightmap_resolution = 512
-    heightmap_meters_per_pixel = 1
-    terrain_texture_resolution = 412
-    use_terrain = False
-
-    # Return codes are ECreateLevelResult defined in CryEdit.h
-    return_code = general.create_level_no_prompt(
-        new_level_name, heightmap_resolution, heightmap_meters_per_pixel, terrain_texture_resolution, use_terrain)
-    if return_code == 1:
-        general.log(f"{new_level_name} level already exists")
-    elif return_code == 2:
-        general.log("Failed to create directory")
-    elif return_code == 3:
-        general.log("Directory length is too long")
-    elif return_code != 0:
-        general.log("Unknown error, failed to create level")
-    else:
-        general.log(f"{new_level_name} level created successfully")
-
-    # Enable idle and update viewport.
+    # Wait for Editor idle loop before executing Python hydra scripts.
     general.idle_enable(True)
+
+    # Basic setup for opened level.
+    helper.open_level(level_name="Base")
     general.idle_wait(1.0)
     general.update_viewport()
     general.idle_wait(0.5)  # half a second is more than enough for updating the viewport.
@@ -205,24 +187,25 @@ def create_basic_atom_level(level_name):
         components=["Material"],
         parent_id=default_level.id)
     azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalUniformScale", ground_plane.id, 32.0)
-    ground_plane_material_asset_path = os.path.join(
-        "Materials", "Presets", "PBR", "metal_chrome.azmaterial")
-    ground_plane_material_asset_value = asset.AssetCatalogRequestBus(
-        bus.Broadcast, "GetAssetIdByPath", ground_plane_material_asset_path, math.Uuid(), False)
-    ground_plane.get_set_test(0, "Default Material|Material Asset", ground_plane_material_asset_value)
 
-    # Work around to add the correct Atom Mesh component
+    # Work around to add the correct Atom Mesh component and asset.
     mesh_type_id = azlmbr.globals.property.EditorMeshComponentTypeId
     ground_plane.components.append(
         editor.EditorComponentAPIBus(
             bus.Broadcast, "AddComponentsOfType", ground_plane.id, [mesh_type_id]
         ).GetValue()[0]
     )
-    ground_plane_mesh_asset_path = os.path.join("Models", "plane.azmodel")
+    ground_plane_mesh_asset_path = os.path.join("TestData", "Objects", "plane.azmodel")
     ground_plane_mesh_asset_value = asset.AssetCatalogRequestBus(
         bus.Broadcast, "GetAssetIdByPath", ground_plane_mesh_asset_path, math.Uuid(), False)
     ground_plane.get_set_test(1, "Controller|Configuration|Mesh Asset", ground_plane_mesh_asset_value)
 
+    # Add Atom Material component and asset.
+    ground_plane_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_chrome.azmaterial")
+    ground_plane_material_asset_value = asset.AssetCatalogRequestBus(
+        bus.Broadcast, "GetAssetIdByPath", ground_plane_material_asset_path, math.Uuid(), False)
+    ground_plane.get_set_test(0, "Default Material|Material Asset", ground_plane_material_asset_value)
+
     # Create directional_light entity and set the properties
     directional_light = hydra.Entity("directional_light")
     directional_light.create_entity(
@@ -239,12 +222,8 @@ def create_basic_atom_level(level_name):
         entity_position=math.Vector3(0.0, 0.0, 1.0),
         components=["Material"],
         parent_id=default_level.id)
-    sphere_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_brass_polished.azmaterial")
-    sphere_material_asset_value = asset.AssetCatalogRequestBus(
-        bus.Broadcast, "GetAssetIdByPath", sphere_material_asset_path, math.Uuid(), False)
-    sphere_entity.get_set_test(0, "Default Material|Material Asset", sphere_material_asset_value)
 
-    # Work around to add the correct Atom Mesh component
+    # Work around to add the correct Atom Mesh component and asset.
     sphere_entity.components.append(
         editor.EditorComponentAPIBus(
             bus.Broadcast, "AddComponentsOfType", sphere_entity.id, [mesh_type_id]
@@ -255,6 +234,12 @@ def create_basic_atom_level(level_name):
         bus.Broadcast, "GetAssetIdByPath", sphere_mesh_asset_path, math.Uuid(), False)
     sphere_entity.get_set_test(1, "Controller|Configuration|Mesh Asset", sphere_mesh_asset_value)
 
+    # Add Atom Material component and asset.
+    sphere_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_brass_polished.azmaterial")
+    sphere_material_asset_value = asset.AssetCatalogRequestBus(
+        bus.Broadcast, "GetAssetIdByPath", sphere_material_asset_path, math.Uuid(), False)
+    sphere_entity.get_set_test(0, "Default Material|Material Asset", sphere_material_asset_value)
+
     # Create camera component and set the properties
     camera_entity = hydra.Entity("camera")
     camera_entity.create_entity(

AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py

@@ -218,6 +218,7 @@ class AtomComponentProperties:
         properties = {
             'name': 'HDR Color Grading',
             'requires': [AtomComponentProperties.postfx_layer()],
+            'Enable HDR color grading': 'Controller|Configuration|LUT Generation|Enable HDR color grading',
         }
         return properties[property]
 

AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py

@@ -33,7 +33,7 @@ def run():
     11. Adds a "camera" entity to "default_level" & adds a Camera component with 80 degree FOV and Transform values:
         Translate - x:5.5m, y:-12.0m, z:9.0m
         Rotate - x:-27.0, y:-12.0, z:25.0
-    12. Finally enters game mode, takes a screenshot, exits game mode, & saves the level.
+    12. Finally enters game mode, takes a screenshot, & exits game mode.
     :return: None
     """
     import azlmbr.asset as asset
@@ -81,33 +81,11 @@ def run():
         general.run_console("r_displayInfo=0")
         general.idle_wait(1.0)
 
-        return True
-
     # Wait for Editor idle loop before executing Python hydra scripts.
     general.idle_enable(True)
 
-    # Open the auto_test level.
-    new_level_name = "auto_test"  # Specified in class TestAllComponentsIndepthTests()
-    heightmap_resolution = 512
-    heightmap_meters_per_pixel = 1
-    terrain_texture_resolution = 412
-    use_terrain = False
-
-    # Return codes are ECreateLevelResult defined in CryEdit.h
-    return_code = general.create_level_no_prompt(
-        new_level_name, heightmap_resolution, heightmap_meters_per_pixel, terrain_texture_resolution, use_terrain)
-    if return_code == 1:
-        general.log(f"{new_level_name} level already exists")
-    elif return_code == 2:
-        general.log("Failed to create directory")
-    elif return_code == 3:
-        general.log("Directory length is too long")
-    elif return_code != 0:
-        general.log("Unknown error, failed to create level")
-    else:
-        general.log(f"{new_level_name} level created successfully")
-
-    # Basic setup for newly created level.
+    # Basic setup for opened level.
+    helper.open_level(level_name="Base")
     after_level_load()
     initial_viewport_setup(SCREEN_WIDTH, SCREEN_HEIGHT)
 

AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_LightComponent.py

@@ -22,7 +22,7 @@ from editor_python_test_tools.editor_test_helper import EditorTestHelper
 
 helper = EditorTestHelper(log_prefix="Atom_EditorTestHelper")
 
-LEVEL_NAME = "auto_test"
+LEVEL_NAME = "Base"
 LIGHT_COMPONENT = "Light"
 LIGHT_TYPE_PROPERTY = 'Controller|Configuration|Light type'
 DEGREE_RADIAN_FACTOR = 0.0174533