Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py

@@ -47,82 +47,6 @@ class TestsAssetProcessorBatch_DependenycyTests(object):
     """
     AssetProcessorBatch Dependency tests
     """
-
-    @pytest.mark.test_case_id("C16877166")
-    @pytest.mark.BAT
-    @pytest.mark.assetpipeline
-    # fmt:off
-    def test_WindowsMacPlatforms_RunAPBatch_NotMissingDependency(self, ap_setup_fixture, asset_processor,
-                                                                 workspace):
-        # fmt:on
-        """
-        Engine Schema
-            This test case has a conditional scenario depending on the existence of surfacetypes.xml in a project.
-            Some projects have this file and others do not. Run the conditional scenario depending on the existence
-            of the file in the project
-                libs/materialeffects/surfacetypes.xml is listed as an entry engine_dependencies.xml
-                libs/materialeffects/surfacetypes.xml is not listed as a missing dependency
-                    in the 'assetprocessorbatch' console output
-
-        Test Steps:
-        1. Assets are pre-processed
-        2. Verify that engine_dependencies.xml exists
-        3. Verify engine_dependencies.xml has surfacetypes.xml present
-        4. Run Missing Dependency scanner against the engine_dependenciese.xml
-        5. Verify that Surfacetypes.xml is NOT in the missing depdencies output
-        6. Add the schema file which allows our xml parser to understand dependencies for our engine_dependencies file
-        7. Process assets
-        8. Run Missing Dependency scanner against the engine_dependenciese.xml
-        9. Verify that surfacetypes.xml is in the missing dependencies out
-        """
-
-        env = ap_setup_fixture
-        BATCH_LOG_PATH = env["ap_batch_log_file"]
-        asset_processor.create_temp_asset_root()
-        asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "engine_dependencies.xml"))
-        asset_processor.add_scan_folder(os.path.join("Assets", "Engine"))
-        asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "Libs", "MaterialEffects", "surfacetypes.xml"))
-
-        # Precondition: Assets are all processed
-        asset_processor.batch_process()
-
-        DEPENDENCIES_PATH = os.path.join(asset_processor.temp_project_cache(), "engine_dependencies.xml")
-        assert os.path.exists(DEPENDENCIES_PATH), "The engine_dependencies.xml does not exist."
-        surfacetypes_in_dependencies = False
-        surfacetypes_missing_logline = False
-
-        # Read engine_dependencies.xml to see if surfacetypes.xml is present
-        with open(DEPENDENCIES_PATH, "r") as dependencies_file:
-            for line in dependencies_file.readlines():
-                if "surfacetypes.xml" in line:
-                    surfacetypes_in_dependencies = True
-                    logger.info("Surfacetypes.xml was listed in the engine_dependencies.xml file.")
-                    break
-
-        if not surfacetypes_in_dependencies:
-            logger.info("Surfacetypes.xml was not listed in the engine_dependencies.xml file.")
-
-        _, output = asset_processor.batch_process(capture_output=True,
-                                                  extra_params="--dsp=%engine_dependencies.xml")
-        log = APOutputParser(output)
-        for _ in log.get_lines(run=-1, contains=["surfacetypes.xml", "Missing"]):
-            surfacetypes_missing_logline = True
-
-        assert surfacetypes_missing_logline, "Surfacetypes.xml not seen in the batch log as missing."
-
-        # Add the schema file which allows our xml parser to understand dependencies for our engine_dependencies file
-        asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "Schema", "enginedependency.xmlschema"))
-        asset_processor.batch_process()
-
-        _, output = asset_processor.batch_process(capture_output=True,
-                                                  extra_params="--dsp=%engine_dependencies.xml")
-        log = APOutputParser(output)
-        surfacetypes_missing_logline = False
-        for _ in log.get_lines(run=-1, contains=["surfacetypes.xml", "Missing"]):
-            surfacetypes_missing_logline = True
-
-        assert not surfacetypes_missing_logline, "Surfacetypes.xml not seen in the batch log as missing."
-
     schemas = [
         ("C16877167", ".ent"),
         ("C16877168", "Environment.xml"),