Update system model unit tests

Author: Isaac-Ito-MW

Components/HEVPowerSplitControl/HEVPowerSplitControl_params.m

@@ -54,7 +54,7 @@
 % These are for controller/driver only.
 % ICs for plant are defined elsewhere.
 
-initial.driverHVBattSOC_pct = initial.highVoltageBatterySOC_pct;
+initial.controllerHVBattSOC_pct = initial.highVoltageBatterySOC_pct;
 
 initial.driverBrakeForce_N = 8000;
 initial.driverBrakeOn_tf = true;

HEV/PowerSplitHEV_DirectInput/PowerSplitHEV_DirectInput_main_script.mlx

@@ -7,36 +7,45 @@
   modelName = "PowerSplitHEV_system_model";
 end
 
-methods (Test)
+methods (TestClassSetup)
+%% Functions to be executed when this unit test class is instanciated.
 
-function defaultReferencedSubsystems_1(testCase)
-%% Test for Default Referenced Subsystems
-% This ensures that all the subsystem reference blocks in the model file have
-% intended referenced subsystems.
-  close all
-  bdclose all
+function setReferencedSubsystems(testCase)
+%% Set referenced subsystems for this unit test.
+% Note that other referenced subsystems may also be used in some tests.
+
+  disp("Running a function from TestClassSetup...")
+
+  % Teardown sets a function to be executed when the class object is destroyed.
+  % In this case, recover the "global default" referenced subsystems.
+  addTeardown(testCase, @PowerSplitHEV_resetReferencedSubsystems, testCase.modelName)
 
   mdl = testCase.modelName;
   load_system(mdl)
 
-  refSubName = get_param(mdl+"/Controller & Environment", "ReferencedSubsystem");
-  verifyEqual(testCase, refSubName, 'PowerSplitHEV_DirectInput_refsub');
+  set_param( mdl + "/Controller & Environment", ...
+    "ReferencedSubsystem", "PowerSplitHEV_DirectInput_refsub");
 
-  refSubName = get_param(mdl+"/High Voltage Battery", "ReferencedSubsystem");
-  verifyEqual(testCase, refSubName, 'BatteryHVElec_refsub');
+  set_param( mdl + "/High Voltage Battery", ...
+    "ReferencedSubsystem", "BatteryHVElec_refsub");
 
-  refSubName = get_param(mdl+"/DC-DC Converter", "ReferencedSubsystem");
-  verifyEqual(testCase, refSubName, 'DcDcConverterElec_refsub');
+  set_param( mdl + "/DC-DC Converter", ...
+    "ReferencedSubsystem", "DcDcConverterElec_refsub");
 
-  refSubName = get_param(mdl+"/Power Split Drive Unit", "ReferencedSubsystem");
-  verifyEqual(testCase, refSubName, 'PowerSplitDriveUnitBasic_refsub');
+  set_param( mdl + "/Power Split Drive Unit", ...
+    "ReferencedSubsystem", "PowerSplitDriveUnitBasic_refsub");
 
-  refSubName = get_param(mdl+"/Longitudinal Vehicle", "ReferencedSubsystem");
-  verifyEqual(testCase, refSubName, 'Vehicle1DCustom_refsub');
+  set_param( mdl + "/Longitudinal Vehicle", ...
+    "ReferencedSubsystem", "Vehicle1DCustom_refsub");
 
-  close all
-  bdclose all
-end
+  save_system(mdl)
+
+end  % function
+
+end  % methods (TestClassSetup)
+
+methods (Test)
+%% Test for Models
 
 function openAndRun_1(testCase)
 %% Most basic check - open model and run simulation.
@@ -61,7 +70,7 @@ function openAndRun_1(testCase)
 
 function openAndRun_2_1(testCase)
 %% Check that the model runs without any warnings or errors.
-% Specify the referenced subsystems.
+% Test referenced subsystems that are different from this unit test's default.
 
   close all
   bdclose all
@@ -91,7 +100,7 @@ function openAndRun_2_1(testCase)
 
 function openAndRun_2_2(testCase)
 %% Check that the model runs without any warnings or errors.
-% Specify the referenced subsystem.
+% Test referenced subsystems that are different from this unit test's default.
 
   close all
   bdclose all
@@ -135,14 +144,6 @@ function runLiveScript_DirectInput_Constant(~)
   bdclose all
 end
 
-function runLiveScript_DirectInput_Accel(~)
-  close all
-  bdclose all
-  PowerSplitHEV_DI_testcase_Accel
-  close all
-  bdclose all
-end
-
 function runLiveScript_DirectInput_Downhill(~)
   close all
   bdclose all
@@ -191,15 +192,13 @@ function runLiveScript_DirectInput_PowerSplitDrive(~)
   bdclose all
 end
 
-%{
 function runLiveScript_main_script(~)
   close all
   bdclose all
   PowerSplitHEV_DirectInput_main_script
   close all
   bdclose all
 end
-%}
 
 end  % methods (Test)
 end  % classdef

HEV/PowerSplitHEV_DirectInput/PowerSplitHEV_DirectInput_refsub.slx

@@ -11,7 +11,7 @@
 
 PrjRoot = currentProject().RootFolder;
 
-TopFolder = fullfile(PrjRoot, "HEV", "PowerSplitHEV");
+TopFolder = fullfile(PrjRoot, "HEV", ComponentName);
 assert(isfolder(TopFolder))
 
 UnitTestFolder = fullfile(TopFolder, "test");
@@ -20,13 +20,10 @@
 UnitTestFile = fullfile(UnitTestFolder, ComponentName+"_UnitTest.m");
 assert(isfile(UnitTestFile))
 
-TestCaseFolder = fullfile(TopFolder, "testcases_DirectInput");
+TestCaseFolder = fullfile(TopFolder, "testcases");
 assert(isfolder(TestCaseFolder))
 
-UtilsFolder = fullfile(TopFolder, "utils_Common");
-assert(isfolder(UtilsFolder))
-
-UtilsFolder = fullfile(TopFolder, "utils_DirectInput");
+UtilsFolder = fullfile(TopFolder, "utils");
 assert(isfolder(UtilsFolder))
 
 %%
@@ -61,22 +58,17 @@
 
 plugin = matlab.unittest.plugins.CodeCoveragePlugin.forFile( ...
   [ fullfile(TopFolder, "test", ComponentName+"_UnitTest.m"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_Accel.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_Constant.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_Downhill.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_Downhill_2.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_MG1Drive.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_MG2Drive.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_MG2Drive_2.mlx"), ...
-    fullfile(TopFolder, "testcases_DirectInput", "PowerSplitHEV_DI_testcase_PowerSplitDrive.mlx"), ...
-    fullfile(TopFolder, "utils_Common", "PowerSplitHEV_plot_result_compact.m"), ...
-    fullfile(TopFolder, "utils_Common", "PowerSplitHEV_plot_result_hvbattery.m"), ...
-    fullfile(TopFolder, "utils_Common", "PowerSplitHEV_plot_result_powersplit.m"), ...
-    fullfile(TopFolder, "utils_Common", "PowerSplitHEV_plot_result_vehicle.m"), ...
-    fullfile(TopFolder, "utils_DirectInput", "PowerSplitHEV_DirectInput_InputSignalBuilder.m"), ...
-    fullfile(TopFolder, "utils_DirectInput", "PowerSplitHEV_DirectInput_setup.m"), ...
-    fullfile(TopFolder, "PowerSplitHEV_DirectInput_main_script.mlx"), ...
-    fullfile(TopFolder, "PowerSplitHEV_params.m") ], ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_Constant.mlx"), ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_Downhill.mlx"), ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_Downhill_2.mlx"), ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_MG1Drive.mlx"), ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_MG2Drive.mlx"), ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_MG2Drive_2.mlx"), ...
+    fullfile(TopFolder, "testcases", "PowerSplitHEV_DI_testcase_PowerSplitDrive.mlx"), ...
+    fullfile(TopFolder, "utils", "PowerSplitHEV_DirectInput_example.m"), ...
+    fullfile(TopFolder, "utils", "PowerSplitHEV_DirectInput_InputSignalBuilder.m"), ...
+    fullfile(TopFolder, "utils", "PowerSplitHEV_DirectInput_selectInput.m"), ...
+    fullfile(TopFolder, "PowerSplitHEV_DirectInput_main_script.mlx") ], ...
   Producing = coverageReport );
 
 addPlugin(runner, plugin)