From 8ee6a1656758d019ee6e2e4dc0a62b653208ba6f Mon Sep 17 00:00:00 2001 From: jckand Date: Thu, 22 Apr 2021 16:22:11 -0500 Subject: [PATCH] - Removing another mistakenly re-merged test file - Updating conftest.py to point to new location for saved layouts --- .../Gem/PythonTests/editor/conftest.py | 2 +- .../editor/test_SearchFiltering.py | 70 ------------------- 2 files changed, 1 insertion(+), 71 deletions(-) delete mode 100755 AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py diff --git a/AutomatedTesting/Gem/PythonTests/editor/conftest.py b/AutomatedTesting/Gem/PythonTests/editor/conftest.py index 328c5ebad4..3260b8834a 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/conftest.py +++ b/AutomatedTesting/Gem/PythonTests/editor/conftest.py @@ -19,7 +19,7 @@ logger = logging.getLogger(__name__) layout = { - 'path': r'Software\Amazon\Lumberyard\Editor\fancyWindowLayouts', + 'path': r'Software\Amazon\O3DE\Editor\fancyWindowLayouts', 'value': 'last' } restore_camera = { diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py b/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py deleted file mode 100755 index fa8b143739..0000000000 --- a/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py +++ /dev/null @@ -1,70 +0,0 @@ -""" -All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -its licensors. - -For complete copyright and license terms please see the LICENSE at the root of this -distribution (the "License"). All use of this software is governed by the License, -or, if provided, by the license below or the license accompanying this file. Do not -remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -""" - -""" -C13660194 : Asset Browser - Filtering -""" - -import os -import pytest -# Bail on the test if ly_test_tools doesn't exist. -pytest.importorskip('ly_test_tools') -import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra - -test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") -log_monitor_timeout = 90 - - -@pytest.mark.parametrize('project', ['AutomatedTesting']) -@pytest.mark.parametrize('level', ['tmp_level']) -@pytest.mark.usefixtures("automatic_process_killer") -@pytest.mark.parametrize("launcher_platform", ['windows_editor']) -class TestSearchFiltering(object): - - @pytest.fixture(autouse=True) - def setup_teardown(self, request, workspace, project, level): - def teardown(): - file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True) - - request.addfinalizer(teardown) - - file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True) - - @pytest.mark.test_case_id("C13660194") - @pytest.mark.SUITE_periodic - def test_SearchFiltering_Asset_Browser_Filtering(self, request, editor, level, launcher_platform): - expected_lines = [ - "cedar.fbx asset is filtered in Asset Browser", - "Animation file type(s) is present in the file tree: True", - "FileTag file type(s) and Animation file type(s) is present in the file tree: True", - "FileTag file type(s) is present in the file tree after removing Animation filter: True", - ] - - unexpected_lines = [ - "Asset Browser opened: False", - "Animation file type(s) is present in the file tree: False", - "FileTag file type(s) and Animation file type(s) is present in the file tree: False", - "FileTag file type(s) is present in the file tree after removing Animation filter: False", - ] - - hydra.launch_and_validate_results( - request, - test_directory, - editor, - "AssetBrowser_SearchFiltering.py", - expected_lines, - unexpected_lines=unexpected_lines, - cfg_args=[level], - auto_test_mode=False, - run_python="--runpython", - timeout=log_monitor_timeout, - )