cmake_file: Remove unecessary function

Author: rwalton-arm

src/mbed_tools/build/_internal/cmake_file.py

@@ -14,27 +14,10 @@
 TEMPLATE_NAME = "mbed_config.tmpl"
 
 
-def generate_mbed_config_cmake_file(
-    mbed_target_name: str, target_build_attributes: dict, config: Config, toolchain_name: str
-) -> str:
-    """Generate the top-level CMakeLists.txt file containing the correct definitions for a build.
-
-    Args:
-        mbed_target: the target the application is being built for
-        target_build_attributes: map of target attributes
-        program_path: the path to the local Mbed program
-        toolchain_name: the toolchain to be used to build the application
-
-    Returns:
-        A string of rendered contents for the file.
-    """
-    return _render_mbed_config_cmake_template(target_build_attributes, config, toolchain_name, mbed_target_name,)
-
-
-def _render_mbed_config_cmake_template(
+def render_mbed_config_cmake_template(
     target_build_attributes: dict, config: Config, toolchain_name: str, target_name: str
 ) -> str:
-    """Renders the mbed_config template with the relevant information.
+    """Renders the mbed_config jinja template with the target and project config settings.
 
     Args:
         target_build_attributes: Target config object.

src/mbed_tools/build/config.py

@@ -8,7 +8,7 @@
 from mbed_tools.lib.json_helpers import decode_json_file
 from mbed_tools.project import MbedProgram
 from mbed_tools.targets import get_target_by_name
-from mbed_tools.build._internal.cmake_file import generate_mbed_config_cmake_file
+from mbed_tools.build._internal.cmake_file import render_mbed_config_cmake_template
 from mbed_tools.build._internal.config.assemble_build_config import assemble_config
 from mbed_tools.build._internal.write_files import write_file
 
@@ -26,7 +26,12 @@ def generate_config(target_name: str, toolchain: str, program: MbedProgram) -> p
     """
     target_build_attributes = get_target_by_name(target_name, decode_json_file(program.mbed_os.targets_json_file))
     config = assemble_config(target_build_attributes, program.root, program.files.app_config_file)
-    cmake_file_contents = generate_mbed_config_cmake_file(target_name, target_build_attributes, config, toolchain)
+    cmake_file_contents = render_mbed_config_cmake_template(
+        target_name=target_name,
+        target_build_attributes=target_build_attributes,
+        config=config,
+        toolchain_name=toolchain,
+    )
     cmake_config_file_path = program.files.cmake_config_file
     write_file(cmake_config_file_path.parent, cmake_config_file_path.name, cmake_file_contents)
     return cmake_config_file_path

tests/build/_internal/test_cmake_file.py

@@ -5,7 +5,7 @@
 import pytest
 
 from tests.build._internal.config.factories import ConfigFactory, SourceFactory
-from mbed_tools.build._internal.cmake_file import generate_mbed_config_cmake_file, _render_mbed_config_cmake_template
+from mbed_tools.build._internal.cmake_file import render_mbed_config_cmake_template
 from mbed_tools.build._internal.config.config import _create_config_option
 
 
@@ -30,20 +30,10 @@ def fake_target():
     }
 
 
-class TestGenerateCMakeListsFile:
-    def test_correct_arguments_passed(self, fake_target):
-        config = ConfigFactory()
-        mbed_target = "K64F"
-
-        result = generate_mbed_config_cmake_file(mbed_target, fake_target, config, TOOLCHAIN_NAME)
-
-        assert result == _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, mbed_target,)
-
-
 class TestRendersCMakeListsFile:
     def test_returns_rendered_content(self, fake_target):
         config = ConfigFactory()
-        result = _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, "target_name")
+        result = render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, "target_name")
 
         for label in fake_target["labels"] + fake_target["extra_labels"]:
             assert label in result
@@ -66,5 +56,5 @@ def test_returns_quoted_content(self, fake_target):
         # Add an option whose value contains quotes to the config.
         _create_config_option(config, "iotc-mqtt-host", '{"mqtt.2030.ltsapis.goog", IOTC_MQTT_PORT}', source)
 
-        result = _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, "target_name")
+        result = render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, "target_name")
         assert '"-DMBED_CONF_IOTC_MQTT_HOST={\\"mqtt.2030.ltsapis.goog\\", IOTC_MQTT_PORT}"' in result