From 2173693462b7829842b380b55e83870ee8243062 Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Tue, 20 Jul 2021 13:59:43 -0500 Subject: [PATCH] Updating component configuration and expected instance counts for SlopeFilter test Signed-off-by: jckand-amzn --- ...lter_ComponentAndOverrides_InstancesPlantOnValidSlope.py | 6 +++--- .../Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py index 895b979f95..d66716cee3 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py @@ -81,7 +81,7 @@ class TestSlopeFilterComponentAndOverrides(EditorTestHelper): # 3) Add surfaces to plant on. This will include a flat surface and a sphere mesh to provide a sloped surface dynveg.create_surface_entity("Planting Surface", center_point, 32.0, 32.0, 1.0) sloped_surface_center = math.Vector3(512.0, 512.0, 38.0) - dynveg.create_mesh_surface_entity_with_slopes("Sloped Planting Surface", sloped_surface_center, 5.0, 5.0, 5.0) + dynveg.create_mesh_surface_entity_with_slopes("Sloped Planting Surface", sloped_surface_center, 10.0) # Set instances to spawn on a center snap point to avoid unexpected instances around the edges of the box shape veg_system_settings_component = hydra.add_level_component("Vegetation System Settings") @@ -101,7 +101,7 @@ class TestSlopeFilterComponentAndOverrides(EditorTestHelper): spawner_entity.get_set_test(3, "Configuration|Slope Max", 45) # 6) Validate instance counts post-filter: instances should only plant on slopes between 20-45 degrees - num_expected_slopes_post_filter = 44 + num_expected_slopes_post_filter = 48 slope_min_max_success = self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape( spawner_entity.id, num_expected_slopes_post_filter), 5.0) self.test_success = slope_min_max_success and self.test_success @@ -115,7 +115,7 @@ class TestSlopeFilterComponentAndOverrides(EditorTestHelper): spawner_entity.get_set_test(2, "Configuration|Embedded Assets|[0]|Slope Filter|Max", 20) # 9) Validate instance counts post-filter: instances should only plant on slopes between 5-20 degrees - num_expected_slopes_post_filter_overrides = 16 + num_expected_slopes_post_filter_overrides = 12 overrides_min_max_success = self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape( spawner_entity.id, num_expected_slopes_post_filter_overrides), 5.0) self.test_success = overrides_min_max_success and self.test_success diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py index 414a089575..acc3c95790 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py @@ -68,7 +68,7 @@ class TestSlopeFilter(object): @pytest.mark.test_case_id("C4814464", "C4874096") @pytest.mark.SUITE_periodic @pytest.mark.dynveg_filter - @pytest.mark.skip # LYN-2211 + @pytest.mark.xfail # LYN-3275 def test_SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlopes(self, request, editor, level, launcher_platform): @@ -79,10 +79,10 @@ class TestSlopeFilter(object): "instance count validation: True (found=1720, expected=1720)", "Instance Spawner Configuration|Slope Min: SUCCESS", "Instance Spawner Configuration|Slope Max: SUCCESS", - "instance count validation: True (found=44, expected=44)", + "instance count validation: True (found=48, expected=48)", "Instance Spawner Configuration|Embedded Assets|[0]|Slope Filter|Min: SUCCESS", "Instance Spawner Configuration|Embedded Assets|[0]|Slope Filter|Max: SUCCESS", - "instance count validation: True (found=16, expected=16)", + "instance count validation: True (found=12, expected=12)", "SlopeFilter_InstancesPlantOnValidSlope: result=SUCCESS" ]