[unit-test-updates] split settings in saveTests and removed addpath

unitTests/saveTests.m

@@ -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
 

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