From ec527151e93d2d464560b767bfc457b75699eb86 Mon Sep 17 00:00:00 2001 From: Erik P G Johansson Date: Fri, 13 Sep 2024 16:41:51 +0200 Subject: [PATCH] BICAS: rdtp: Rename top-level functions renamed: src/+bicas/+tools/+rtdp/main.m -> src/+bicas/+tools/+rtdp/create_RCS_test_data_package.m modified: src/+bicas/+tools/+rtdp/misc.m modified: src/+bicas/+tools/+rtdp/misc___UTEST.m --- .../+rtdp/{main.m => create_RCS_test_data_package.m} | 6 +++--- .../bicas/src/+bicas/+tools/+rtdp/misc.m | 12 ++++++------ .../bicas/src/+bicas/+tools/+rtdp/misc___UTEST.m | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) rename mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/{main.m => create_RCS_test_data_package.m} (82%) diff --git a/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/main.m b/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/create_RCS_test_data_package.m similarity index 82% rename from mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/main.m rename to mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/create_RCS_test_data_package.m index bf5942df1..eb68d4449 100644 --- a/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/main.m +++ b/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/create_RCS_test_data_package.m @@ -31,8 +31,8 @@ % % % Author: Erik P G Johansson, IRF, Uppsala, Sweden -function main(outputParentDir, letterVersion, configFile) -% bicas.tools.rtdp.main('/nonhome_data/SOLAR_ORBITER/bicas_test_packages/temp', 'A', '/nonhome_data/work_files/SOLAR_ORBITER/rtdp_config.json') +function create_RCS_test_data_package(outputParentDir, letterVersion, configFile) +% bicas.tools.rtdp.create_RCS_test_data_package('/nonhome_data/SOLAR_ORBITER/bicas_test_packages/temp', 'A', '/nonhome_data/work_files/SOLAR_ORBITER/rtdp_config.json') % % PROPOSAL: Better name for function. % create @@ -51,6 +51,6 @@ function main(outputParentDir, letterVersion, configFile) % rcstdpkg (TD = Test Data) % rtdp (= RCS Test Data Package) -bicas.tools.rtdp.misc.create_RCS_test_pkg(... +bicas.tools.rtdp.misc.create_RCS_test_data_package(... outputParentDir, letterVersion, configFile, false) end diff --git a/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc.m b/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc.m index a63cb118e..274d5475e 100644 --- a/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc.m +++ b/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc.m @@ -30,22 +30,22 @@ - % De facto top-level function for the bicas.tools.rtdp package, with - % the added argument automatedTestRun for tests. The nominal user is - % supposed to call bicas.tools.rtdp.main() (a trivial wrapper) but - % tests should call this function. + % De facto top-level function for the bicas.tools.rtdp package, with the + % added argument automatedTestRun for tests. The nominal user is supposed + % to call bicas.tools.rtdp.create_RCS_test_data_package() (a trivial + % wrapper) but tests should call this function. % % % ARGUMENTS % ========= - % See bicas.tools.rtdp.main(). + % See bicas.tools.rtdp.create_RCS_test_data_package(). % automatedTestRun % Whether the function is called by an automated test or not. % NOTE: This is substitute for submitting a class for calling BICAS % (or a function handle), which would then be mocked for tests, which % would be overkill for this application. % - function create_RCS_test_pkg( ... + function create_RCS_test_data_package( ... outputParentDir, letterVersion, configFile, automatedTestRun) % % PROPOSAL: Separate function file. diff --git a/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc___UTEST.m b/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc___UTEST.m index 9e0a93d11..34e081a7b 100644 --- a/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc___UTEST.m +++ b/mission/solar_orbiter/bicas/src/+bicas/+tools/+rtdp/misc___UTEST.m @@ -62,7 +62,7 @@ function test0(testCase) % TEMP_CONFIG_FILE = '/home/erjo/temp/temp/roctestpkg.json'; TEMP_CONFIG_FILE = testCase.configFile; - bicas.tools.rtdp.misc.create_RCS_test_pkg(... + bicas.tools.rtdp.misc.create_RCS_test_data_package(... testCase.dir, 'A', TEMP_CONFIG_FILE, true) end