Maintenance cycle R2025b

Author: vboutrou

.github/workflows/ci.yml

@@ -19,9 +19,11 @@ jobs:
     strategy: 
       fail-fast: false
       matrix:
-        MATLABVersion: [R2024a,R2024b]
+        MATLABVersion: [R2024b,R2025a]
     runs-on: ubuntu-latest
-    steps:
+    env:
+      LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
+      steps:
       # Checks-out your repository
       - uses: actions/checkout@v4
 

README.md

@@ -21,7 +21,7 @@ You can use these live scripts as demonstrations in lectures, class activities,
 
 ## Contact Us
 
-Contact the [MathWorks teaching resources team](mailto:onlineteaching@mathworks.com) if you would like to provide feedback, or if you have a question.
+Contact the [MathWorks Educator Content Development Team](mailto:onlineteaching@mathworks.com) if you would like to provide feedback, or if you have a question.
 
 
 ## Prerequisites

README.mlx

@@ -32,7 +32,7 @@ function PostSmokeTest(ShowReport)
 % Format the results in a table and save them
 Results = table(Results');
 Version = extractBetween(string(Results.Name),"Version=",")");
-Passed = Results.Passed;
+Passed = logical(Results.Passed);
 
 % Add link to other report
 File = fileread(fullfile("public","index.html"));
@@ -51,7 +51,7 @@ function PostSmokeTest(ShowReport)
     Badge.message = join("R"+Version," | ");
 elseif any(Passed)
     Badge.color = "yellowgreen";
-    Badge.message = join("R")
+    Badge.message = join("R"+Version(Passed)," | ");
 elseif all(~Passed)
     Badge.color = "critical";
     Badge.message = join("R"+Version," | ");

Scripts/TreasureHuntAdvanced.mlx

@@ -2,15 +2,16 @@
 
     properties
         RootFolder
-    end
+        sparedEditors % Files already open when the test starts
+    end % properties
 
     properties (ClassSetupParameter)
         Project = {currentProject()};
-    end
+    end % ClassSetupParameter
 
     properties (TestParameter)
         File;
-    end
+    end % TestParameter
 
     methods (TestParameterDefinition,Static)
 
@@ -21,7 +22,7 @@
             File = {File.name}; 
         end
 
-    end
+    end % Static TestParameterDefinition
 
     methods (TestClassSetup)
 
@@ -37,8 +38,28 @@ function SetUpSmokeTest(testCase,Project) %#ok<INUSD>
             testCase.log("Running in " + version)
         end
 
-    end
+    end % TestClassSetup
+
+    methods(TestMethodSetup)
+        function recordEditorsToSpare(testCase)
+            testCase.sparedEditors = matlab.desktop.editor.getAll;
+            testCase.sparedEditors = {testCase.sparedEditors.Filename};
+        end
+    end % TestMethodSetup
 
+    methods(TestMethodTeardown)
+        function closeOpenedEditors_thenDeleteWorkingDir(testCase)
+            openEditors = matlab.desktop.editor.getAll;
+            for editor=openEditors(1:end)
+                if any(strcmp(editor.Filename, testCase.sparedEditors))
+                    continue;
+                end
+                % if not on our list, close the file
+                editor.close();
+            end
+        end
+    end % TestMethodTeardown
+
     methods(Test)
 
         function SmokeRun(testCase,File)
@@ -90,7 +111,7 @@ function SmokeRun(testCase,File)
 
         end
 
-    end
+    end % Test Methods
 
 
     methods (Access = private)
@@ -125,6 +146,6 @@ function SmokeRun(testCase,File)
             Path = PostFilePath;
         end
 
-    end
+    end % Private Methods
 
-end
+end % Smoketests

SoftwareTests/PostSmokeTest.m

@@ -3,26 +3,47 @@
     properties
         RootFolder
         isSolnOnPath
-    end
+        sparedEditors % Track open files
+    end % properties
 
     properties (ClassSetupParameter)
         Project = {currentProject()};
-    end
+    end % ClassSetupParameter
+
+    methods(TestMethodSetup)
+        function recordEditorsToSpare(testCase)
+            testCase.sparedEditors = matlab.desktop.editor.getAll;
+            testCase.sparedEditors = {testCase.sparedEditors.Filename};
+        end
+    end % TestMethodSetup
+
+    methods(TestMethodTeardown)
+        function closeOpenedEditors_thenDeleteWorkingDir(testCase)
+            openEditors = matlab.desktop.editor.getAll;
+            for editor=openEditors(1:end)
+                if any(strcmp(editor.Filename, testCase.sparedEditors))
+                    continue;
+                end
+                % if not on our list, close the file
+                editor.close();
+            end
+        end
+    end % TestMethodTeardown
 
     properties (TestParameter)
         File;
-    end
+    end % TestParameter
 
     methods (TestParameterDefinition,Static)
 
         function File = GetScriptName(Project)
             % Retrieve student template files:
             RootFolder = Project.RootFolder;
             File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
-            File = {File.name}; 
+            File = {File.name};
         end
 
-    end
+    end % Static TestParameterDefinition
 
     methods (TestClassSetup)
 
@@ -34,7 +55,7 @@ function SetUpPath(testCase,Project)
             % Check that solutions are on path:
             testCase.isSolnOnPath = isfolder("Solutions");
             if testCase.isSolnOnPath == 0
-                addpath(fullfile(testCase.RootFolder,"InstructorResources","Solutions"))
+                addpath(genpath(fullfile(testCase.RootFolder,"InstructorResources","Solutions")))
             end
 
             % Close the StartUp app if still open:
@@ -54,7 +75,7 @@ function SetUpPath(testCase,Project)
         function ExistSolns(testCase,File)
             SolutionName = replace(string(File),".mlx","Soln.mlx");
             assert(exist(SolutionName,"file"),"Missing solutions for "+File);
-        end  
+        end
 
 
         function SmokeRun(testCase,File)
@@ -106,8 +127,8 @@ function SmokeRun(testCase,File)
 
         end
 
-    end
-    
+    end % Test Methods
+
     methods (Access = private)
 
         function Path = CheckPreFile(testCase,Filename)
@@ -140,6 +161,16 @@ function SmokeRun(testCase,File)
             Path = PostFilePath;
         end
 
-    end
+    end % Private Access Methods
+
+    methods (TestClassTeardown)
+
+        function ResetPath(testCase)
+            if ~testCase.isSolnOnPath && exist("Solutions","dir")
+                rmpath(genpath(fullfile(currentProject().RootFolder,"InstructorResources","Solutions")))
+            end
+        end
+
+    end % TestClassTeardown
 
-end
+end % SolnSmokeTests