From 36eb5845d43e7ca033afe4d3d44811f1fbe0b63f Mon Sep 17 00:00:00 2001 From: LolloBici <lorenzo.amici@skywarder.eu> Date: Wed, 11 Jun 2025 19:14:29 +0200 Subject: [PATCH] [unit-test-updates] split settings in saveTests and removed addpath --- unitTests/mainUnitTest.m | 2 +- unitTests/saveTests.m | 14 +++++++------- unitTests/tests/TestSimulator.m | 15 +++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/unitTests/mainUnitTest.m b/unitTests/mainUnitTest.m index c3d2ea49..d546408c 100644 --- a/unitTests/mainUnitTest.m +++ b/unitTests/mainUnitTest.m @@ -1,4 +1,4 @@ -function [apoResults, optResults,sensResults,simResults] = mainUnitTest(options) +function [apoResults, optResults, sensResults, simResults] = mainUnitTest(options) arguments options.testApogeeAnalysis logical = []; options.testOptimization logical = []; diff --git a/unitTests/saveTests.m b/unitTests/saveTests.m index 7d2e3bec..1da82a0c 100644 --- a/unitTests/saveTests.m +++ b/unitTests/saveTests.m @@ -3,7 +3,7 @@ arguments rocket = [] % Rocket = Rocket.empty wind = [] % Wind = Wind.empty environment = [] % Environment = Environment.empty - settings = [] % Settings = Settings.empty + settings = [] % Settings = Settings.empty options.saveTestApogeeAnalysis logical = []; options.saveTestOptimization logical = []; options.saveTestSensitivity logical = []; @@ -19,22 +19,22 @@ mission = Mission(true); if isempty(rocket), rocket = Rocket(mission); end if isempty(environment), environment = Environment(mission, rocket.motor); end if isempty(wind), wind = Wind(mission); end -if isempty(settings) - simPath = fullfile(fileparts(mfilename('fullpath')),'..', 'simulator', 'simulatorConfig.m'); - %odePath = fullfile(fileparts(mfilename('fullpath')), '..', '..', 'common', 'settings ', 'odeConfig.m'); - settings = Settings(simPath, 'ode','unitTest'); -end +if isempty(settings), settings = Settings('unitTest'); end Settings.read(settings, options, 'unitTest'); %% CREATING SIMULATOR TESTS if ~isempty(settings.unitTest.saveTestSimulator) + simPath = fullfile(fileparts(mfilename('fullpath')),'..', 'simulator', 'simulatorConfig.m'); + simSettings = Settings('ode', simPath); for k = 1:length(settings.unitTest.saveTestSimulator) - TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, mission, rocket, wind, environment, settings ); + TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, rocket, wind, environment, simSettings ); end end %% TEST APOGEE ANALYSIS if settings.unitTest.saveTestApogeeAnalysis + apoPath = fullfile(fileparts(mfilename('fullpath')),'..', 'apogeeAnalysis', 'apogeeAnalysisConfig.m'); + apoSettings = Settings('ode', apoPath); TestApogeeAnalysis.saveTest(mission); end diff --git a/unitTests/tests/TestSimulator.m b/unitTests/tests/TestSimulator.m index 34603fbc..0072ee26 100644 --- a/unitTests/tests/TestSimulator.m +++ b/unitTests/tests/TestSimulator.m @@ -3,17 +3,18 @@ classdef TestSimulator < matlab.unittest.TestCase properties settings refSimulator + rocket + wind + environment end properties (MethodSetupParameter) verifiable = {'multipleAB', 'ballistic', 'engineCut', 'solid', 'HRE'}; end - methods (TestMethodSetup) function setup(testCase, verifiable) currentPath = fileparts(mfilename('fullpath')); - addpath(genpath(currentPath)); fileName = sprintf("referenceState_%s.mat", verifiable); filePath = fullfile(currentPath, '..', 'data', 'testSimulator', verifiable, fileName); @@ -35,7 +36,8 @@ classdef TestSimulator < matlab.unittest.TestCase methods (TestMethodTeardown) function teardown(testCase) - close all + mainSimPath = fullfile('..', '..', 'simulator'); + rmpath(genpath(mainSimPath)); end end @@ -53,10 +55,9 @@ classdef TestSimulator < matlab.unittest.TestCase end methods (Static) - function saveTest(verifiable,mission,rocket, wind, environment, settings) + function saveTest(verifiable, rocket, wind, environment, settings) Time = tic; currentPath = fileparts(mfilename('fullpath')); - addpath(genpath(currentPath)); disp('Started saving simulator tests') @@ -86,12 +87,10 @@ classdef TestSimulator < matlab.unittest.TestCase end save(filePath,'stateA','stateF', 'settings',... - 'mission', 'rocket', 'environment', 'wind'); + 'rocket', 'environment', 'wind'); Time = toc(Time); fprintf('\t %s test created in: %2.2f seconds\n',verifiable, Time) - - end end end -- GitLab