Improve test analysis to handle function tests

Author: eszmw

SoftwareTests/CrossReleaseTestResults.m

@@ -68,15 +68,18 @@ function verifyAllTestsPassedInArtifact(testCase, ResultArtifactPath)
             rootFolder = testCase.Project{1}.RootFolder;
             resultFiles = FileCollection.fromPaths(fullfile(rootFolder, "public", ResultArtifactPath, "*.mat")).paths;
 
-            loadedData = load(resultFiles, "result");
-            testCase.assertTrue(isfield(loadedData, "result"), ...
-                "Missing variable 'result' in artifact: " + ResultArtifactPath);
+            allResults = [];
+            for i = 1:numel(resultFiles)
+                loadedData = load(resultFiles(i), "result");
+                testCase.assertTrue(isfield(loadedData, "result"), ...
+                    "Missing variable 'result' in artifact: " + resultFiles(i));
+                allResults = [allResults, loadedData.result]; %#ok<AGROW>
+            end
 
-            result = loadedData.result;
-            testCase.assertNotEmpty(result, ...
+            testCase.assertNotEmpty(allResults, ...
                 "Result array is empty in artifact: " + ResultArtifactPath);
 
-            passedValues = [result.Passed];
+            passedValues = [allResults.Passed];
             testCase.assertNotEmpty(passedValues, ...
                 "Result.Passed is empty in artifact: " + ResultArtifactPath);
 

SoftwareTests/FunctionTests.m

@@ -1,8 +1,3 @@
-% Run these tests with 
-% runMyTests
-% OR
-% results = runtests(tLibrary)
-% table(results)
 classdef FunctionTests < matlab.unittest.TestCase
 
     methods(Test)
@@ -17,4 +12,26 @@ function RunShowTaylor(testCase)
 
     end % methods
 
+    methods(TestMethodTeardown)
+
+        function cleanUpFigures(testCase)
+            figures = findall(groot, 'Type', 'figure');
+            figures = flipud(figures);
+            if ~isempty(figures)
+                for iFigure = 1:size(figures, 1)
+                    if ~isempty(figures(iFigure).Number)
+                        figDiag = matlab.unittest.diagnostics.FigureDiagnostic(figures(iFigure), 'Formats', 'png');
+                        log(testCase, 1, figDiag);
+                    end
+                end
+            end
+
+            % Cleanup avoids cross-test contamination in desktop and CI runs.
+            close all force
+            if any(matlab.addons.installedAddons().Name == "Simulink")
+                bdclose all
+            end
+        end
+    end  % TestMethodTeardown
+
 end % classdef