Skip to content

Commit 567a25b

Browse files
Isaac-Ito-MWIsaac-Ito-MW
committed
Update
1 parent c0749f8 commit 567a25b

File tree

209 files changed

+6100
-384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+6100
-384
lines changed

‎ChangeLog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ MATLAB Release
66

77
- This version requires MATLAB R2022a or newer.
88

9+
Project
10+
11+
- Files and folders are reorganized.
12+
913
Models
1014

1115
- Simulink model files are saved in `mdl` format.

‎Components/DrivePattern/DrivePattern_main_script.mlx‎

-3.54 KB
Binary file not shown.

‎Components/DrivePattern/utils/DrivePattern_harness_setup.m‎ renamed to ‎Components/DrivePattern/harnessModels/DrivePattern_harness_setup.m‎

File renamed without changes.

‎Components/DrivePattern/test/DrivePattern_runtests.m‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,28 @@
1414
TopFolder = fullfile(PrjRoot, "Components", ComponentName);
1515
assert(isfolder(TopFolder))
1616

17-
UnitTestFolder = fullfile(TopFolder, "test");
18-
assert(isfolder(UnitTestFolder))
17+
% PackageFolder = fullfile(TopFolder, "+"+ComponentName+"Utility");
18+
% assert(isfolder(PackageFolder))
1919

20-
UnitTestFile = fullfile(UnitTestFolder, ComponentName+"_UnitTest.m");
21-
assert(isfile(UnitTestFile))
20+
HarnessFolder = fullfile(TopFolder, "harnessModels");
21+
assert(isfolder(HarnessFolder))
2222

23-
suite = matlab.unittest.TestSuite.fromFile( UnitTestFile );
23+
UnitTestFolder = fullfile(TopFolder, "test");
24+
assert(isfolder(UnitTestFolder))
2425

2526
TestCaseFolder = fullfile(TopFolder, "testcases");
2627
assert(isfolder(TestCaseFolder))
2728

28-
% PackageFolder = fullfile(TopFolder, "+"+ComponentName+"Utility");
29-
% assert(isfolder(PackageFolder))
30-
3129
UtilsFolder = fullfile(TopFolder, "utils");
3230
assert(isfolder(UtilsFolder))
3331

32+
%% Test Suite & Runner
33+
34+
UnitTestFile = fullfile(UnitTestFolder, ComponentName+"_UnitTest.m");
35+
assert(isfile(UnitTestFile))
36+
37+
suite = matlab.unittest.TestSuite.fromFile( UnitTestFile );
38+
3439
runner = matlab.unittest.TestRunner.withTextOutput( ...
3540
OutputDetail = matlab.unittest.Verbosity.Detailed );
3641

@@ -58,18 +63,20 @@
5863
MainFile = CoverageReportFile );
5964

6065
plugin = matlab.unittest.plugins.CodeCoveragePlugin.forFile( ...
61-
[ fullfile(UnitTestFolder, ComponentName+"_UnitTest.m"), ...
66+
[ ...
67+
fullfile(HarnessFolder, ComponentName+"_harness_setup.m"), ...
68+
fullfile(UnitTestFolder, ComponentName+"_UnitTest.m"), ...
6269
fullfile(TestCaseFolder, ComponentName+"_testcase_AccelDecel.mlx"), ...
6370
fullfile(TestCaseFolder, ComponentName+"_testcase_AccelDecelTwice.mlx"), ...
6471
fullfile(TestCaseFolder, ComponentName+"_testcase_Constant.mlx"), ...
6572
fullfile(TestCaseFolder, ComponentName+"_testcase_FTP75.mlx"), ...
6673
fullfile(TestCaseFolder, ComponentName+"_testcase_SimpleDrivePattern.mlx"), ...
6774
fullfile(TestCaseFolder, ComponentName+"_testcase_Step3.mlx"), ...
6875
fullfile(TestCaseFolder, ComponentName+"_testcase_Step5.mlx"), ...
69-
fullfile(UtilsFolder, ComponentName+"_harness_setup.m"), ...
7076
fullfile(UtilsFolder, ComponentName+"_InputSignalBuilder.m"), ...
7177
fullfile(UtilsFolder, ComponentName+"_plot_inputs.m"), ...
72-
fullfile(UtilsFolder, ComponentName+"_plot_results.m") ], ...
78+
fullfile(UtilsFolder, ComponentName+"_plot_results.m"), ...
79+
fullfile(TopFolder, ComponentName+"_main_script.mlx") ], ...
7380
Producing = coverageReport );
7481

7582
addPlugin(runner, plugin)

‎Components/DrivePattern/test/TestResults_R2022a.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
22
<testsuites>
3-
<testsuite errors="0" failures="0" name="DrivePattern_UnitTest" skipped="0" tests="16" time="57.3225">
4-
<testcase classname="DrivePattern_UnitTest" name="run_harness_model_1" time="5.8746"/>
5-
<testcase classname="DrivePattern_UnitTest" name="input_Constant" time="0.057164"/>
6-
<testcase classname="DrivePattern_UnitTest" name="input_Step3" time="0.50432"/>
7-
<testcase classname="DrivePattern_UnitTest" name="input_Step5" time="0.28423"/>
8-
<testcase classname="DrivePattern_UnitTest" name="input_Accelerate_Decelerate" time="3.5434"/>
9-
<testcase classname="DrivePattern_UnitTest" name="input_Accelerate_Decelerate_Twice" time="0.69819"/>
10-
<testcase classname="DrivePattern_UnitTest" name="input_SimpleDrivePattern" time="0.51522"/>
11-
<testcase classname="DrivePattern_UnitTest" name="input_FTP75" time="0.053568"/>
12-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_1" time="6.7664"/>
13-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_2" time="5.7168"/>
14-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_3" time="5.3197"/>
15-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_4" time="5.3632"/>
16-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_5" time="5.3293"/>
17-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_6" time="5.2664"/>
18-
<testcase classname="DrivePattern_UnitTest" name="run_testcase_7" time="5.1154"/>
19-
<testcase classname="DrivePattern_UnitTest" name="run_main_script_1" time="6.9147"/>
3+
<testsuite errors="0" failures="0" name="DrivePattern_UnitTest" skipped="0" tests="16" time="57.4781">
4+
<testcase classname="DrivePattern_UnitTest" name="run_harness_model_1" time="6.5737"/>
5+
<testcase classname="DrivePattern_UnitTest" name="input_Constant" time="0.031038"/>
6+
<testcase classname="DrivePattern_UnitTest" name="input_Step3" time="0.38886"/>
7+
<testcase classname="DrivePattern_UnitTest" name="input_Step5" time="0.37748"/>
8+
<testcase classname="DrivePattern_UnitTest" name="input_Accelerate_Decelerate" time="2.4361"/>
9+
<testcase classname="DrivePattern_UnitTest" name="input_Accelerate_Decelerate_Twice" time="0.35176"/>
10+
<testcase classname="DrivePattern_UnitTest" name="input_SimpleDrivePattern" time="0.2951"/>
11+
<testcase classname="DrivePattern_UnitTest" name="input_FTP75" time="0.048136"/>
12+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_1" time="6.7924"/>
13+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_2" time="5.8516"/>
14+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_3" time="5.6957"/>
15+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_4" time="5.5861"/>
16+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_5" time="5.4984"/>
17+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_6" time="5.6351"/>
18+
<testcase classname="DrivePattern_UnitTest" name="run_testcase_7" time="5.3301"/>
19+
<testcase classname="DrivePattern_UnitTest" name="run_main_script_1" time="6.5868"/>
2020
</testsuite>
2121
</testsuites>

‎Components/Engine/Engine_main_script.mlx‎

17 Bytes
Binary file not shown.

‎Components/Engine/utils/Engine_harness_setup.m‎ renamed to ‎Components/Engine/harnessModels/Engine_harness_setup.m‎

File renamed without changes.

‎Components/Engine/test/Engine_UnitTest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function plot_script_1(testCase)
194194
% A proper block must be selected for this script to work.
195195
% This is assuming that the default referenced subsystem for the "Engine" subsystem
196196
% contains the custom Engine block.
197-
EngineUtility.plotCustomEngineCurves(gcb)
197+
EngineUtility.plotCustomEngineCurves(gcb);
198198

199199
close all
200200
bdclose all

‎Components/Engine/test/Engine_runtests.m‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,28 @@
1414
TopFolder = fullfile(PrjRoot, "Components", ComponentName);
1515
assert(isfolder(TopFolder))
1616

17+
PackageFolder = fullfile(TopFolder, "+"+ComponentName+"Utility");
18+
assert(isfolder(PackageFolder))
19+
20+
HarnessFolder = fullfile(TopFolder, "harnessModels");
21+
assert(isfolder(HarnessFolder))
22+
1723
UnitTestFolder = fullfile(TopFolder, "test");
1824
assert(isfolder(UnitTestFolder))
1925

26+
% TestCaseFolder = fullfile(TopFolder, "testcases");
27+
% assert(isfolder(TestCaseFolder))
28+
29+
UtilsFolder = fullfile(TopFolder, "utils");
30+
assert(isfolder(UtilsFolder))
31+
32+
%% Test Suite & Runner
33+
2034
UnitTestFile = fullfile(UnitTestFolder, ComponentName+"_UnitTest.m");
2135
assert(isfile(UnitTestFile))
2236

2337
suite = matlab.unittest.TestSuite.fromFile( UnitTestFile );
2438

25-
PackageFolder = fullfile(TopFolder, "+"+ComponentName+"Utility");
26-
assert(isfolder(PackageFolder))
27-
28-
UtilsFolder = fullfile(TopFolder, "utils");
29-
assert(isfolder(UtilsFolder))
30-
3139
runner = matlab.unittest.TestRunner.withTextOutput( ...
3240
OutputDetail = matlab.unittest.Verbosity.Detailed );
3341

@@ -55,13 +63,15 @@
5563
MainFile = CoverageReportFile );
5664

5765
plugin = matlab.unittest.plugins.CodeCoveragePlugin.forFile( ...
58-
[ fullfile(UnitTestFolder, ComponentName+"_UnitTest.m"), ...
66+
[ ...
5967
fullfile(PackageFolder, "plotCustomEngineCurves.m"), ...
60-
fullfile(UtilsFolder, ComponentName+"_harness_setup.m"), ...
68+
fullfile(HarnessFolder, ComponentName+"_harness_setup.m"), ...
69+
fullfile(UnitTestFolder, ComponentName+"_UnitTest.m"), ...
6170
fullfile(UtilsFolder, ComponentName+"_InputSignalBuilder.m"), ...
6271
fullfile(UtilsFolder, ComponentName+"_plot_inputs_power_split.m"), ...
6372
fullfile(UtilsFolder, ComponentName+"_plot_inputs_simple.m"), ...
64-
fullfile(UtilsFolder, ComponentName+"_plot_results.m") ], ...
73+
fullfile(UtilsFolder, ComponentName+"_plot_results.m"), ...
74+
fullfile(TopFolder, ComponentName+"_main_script.mlx") ], ...
6575
Producing = coverageReport );
6676

6777
addPlugin(runner, plugin)

‎Components/Engine/test/TestResults_R2022a.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
2+
<testsuites>
3+
<testsuite errors="0" failures="0" name="Engine_UnitTest" skipped="0" tests="10" time="31.2496">
4+
<testcase classname="Engine_UnitTest" name="defaultReferencedSubsystem_1" time="0.64261"/>
5+
<testcase classname="Engine_UnitTest" name="defaultReferencedSubsystem_2" time="0.63711"/>
6+
<testcase classname="Engine_UnitTest" name="run_harnessSimple_1" time="2.7799"/>
7+
<testcase classname="Engine_UnitTest" name="run_harnessSimple_2_1" time="2.7953"/>
8+
<testcase classname="Engine_UnitTest" name="run_harnessSimple_2_2" time="2.6737"/>
9+
<testcase classname="Engine_UnitTest" name="run_harnessPowerSplit_1" time="4.9592"/>
10+
<testcase classname="Engine_UnitTest" name="run_harnessPowerSplit_2_1" time="5.0277"/>
11+
<testcase classname="Engine_UnitTest" name="run_harnessPowerSplit_2_2" time="4.2105"/>
12+
<testcase classname="Engine_UnitTest" name="plot_script_1" time="1.0022"/>
13+
<testcase classname="Engine_UnitTest" name="run_main_script_1" time="6.5215"/>
14+
</testsuite>
15+
</testsuites>

0 commit comments

Comments
 (0)