Maintenance for R2025b

Update to new startup app
Improve ci.yml
Standardize project details
Remove reference to emailing for solutions in README as the solutions are included in Instructor Resources
Update identity as the MathWorks Educator Content Development team

Author: WynterJ

.github/workflows/ci.yml

@@ -19,8 +19,10 @@ jobs:
     strategy: 
       fail-fast: false
       matrix:
-        MATLABVersion: [R2024a,R2024b]
+        MATLABVersion: [R2024b,R2025a,R2025b]
     runs-on: ubuntu-latest
+    env:
+      LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
     steps:
       # Checks-out your repository
       - uses: actions/checkout@v4
@@ -48,6 +50,7 @@ jobs:
 
       # Upload the test results as artifact
       - name: Upload TestResults
+        if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
           name: TestResults_${{ matrix.MATLABVersion }}

MainMenu.mlx

@@ -24,7 +24,7 @@ The instructions inside the live scripts will guide you through the exercises an
 
 ## 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
@@ -106,9 +106,9 @@ Or feel free to explore our other [modular courseware content](https://www.mathw
 
 # Contribute 
 
-Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks teaching resources team](mailto:%20onlineteaching@mathworks.com). If you want to contribute directly to this project, you can find information about how to do so in the [CONTRIBUTING.md](https://github.com/MathWorks-Teaching-Resources/Climate-Data-Visualization-and-Analysis/blob/release/CONTRIBUTING.md) page on GitHub.
+Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks Educator Content Development Team](mailto:%20onlineteaching@mathworks.com). If you want to contribute directly to this project, you can find information about how to do so in the [CONTRIBUTING.md](https://github.com/MathWorks-Teaching-Resources/Climate-Data-Visualization-and-Analysis/blob/release/CONTRIBUTING.md) page on GitHub.
 
 
- *©* Copyright 2024 The MathWorks™, Inc
+ *©* Copyright 2025 The MathWorks, Inc
+
 
-

README.md

@@ -31,8 +31,8 @@ function PostSmokeTest(ShowReport)
 
 % Format the results in a table and save them
 Results = table(Results');
-Results = Results(Results.Passed,:);
 Version = extractBetween(string(Results.Name),"Version=",")");
+Passed = logical(Results.Passed);
 
 % Add link to other report
 File = fileread(fullfile("public","index.html"));
@@ -45,13 +45,16 @@ function PostSmokeTest(ShowReport)
 % Format the JSON file
 Badge = struct;
 Badge.schemaVersion = 1;
-Badge.label = "Tested with";
-if size(Results,1) >= 1
-    Badge.color = "success"
+Badge.label = "Test Status";
+if all(Passed)
+    Badge.color = "success";
+    Badge.message = join("R"+Version," | ");
+elseif any(Passed)
+    Badge.color = "yellowgreen";
+    Badge.message = join("R"+Version(Passed)," | ");
+elseif all(~Passed)
+    Badge.color = "critical";
     Badge.message = join("R"+Version," | ");
-else
-    Badge.color = "failure";
-    Badge.message = "Pipeline fails";
 end
 Badge = jsonencode(Badge);
 writelines(Badge,fullfile("Images","TestedWith.json"));

README.mlx

@@ -2,26 +2,28 @@
 
     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)
 
         function File = RetrieveFile(Project) %#ok<INUSD>
             % Retrieve student template files:
             RootFolder = currentProject().RootFolder;
-            File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
+            File = dir(fullfile(RootFolder,"Scripts","*.m"));
+            File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
             File = {File.name}; 
         end
 
-    end
+    end % Static TestParameterDefinition
 
     methods (TestClassSetup)
 
@@ -37,8 +39,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,13 +112,13 @@ function SmokeRun(testCase,File)
 
         end
 
-    end
+    end % Test Methods
 
 
     methods (Access = private)
 
        function Path = CheckPreFile(testCase,Filename)
-            PreFile = "Pre"+replace(Filename,".mlx",".m");
+            PreFile = "Pre"+extractBefore(Filename,".m")+".m";
             PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -112,7 +134,7 @@ function SmokeRun(testCase,File)
         end
 
         function Path = CheckPostFile(testCase,Filename)
-            PostFile = "Post"+replace(Filename,".mlx",".m");
+            PostFile = "Post"+extractBefore(Filename,".m")+".m";
             PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
@@ -125,6 +147,6 @@ function SmokeRun(testCase,File)
             Path = PostFilePath;
         end
 
-    end
+    end % Private Methods
 
-end
+end % Smoketests

SoftwareTests/PostSmokeTest.m

@@ -3,26 +3,48 @@
     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 = dir(fullfile(RootFolder,"Scripts","*.m"));
+            File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
+            File = {File.name};
         end
 
-    end
+    end % Static TestParameterDefinition
 
     methods (TestClassSetup)
 
@@ -34,7 +56,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:
@@ -52,16 +74,16 @@ function SetUpPath(testCase,Project)
         % Check that solutions files exist for each of the student
         % templates
         function ExistSolns(testCase,File)
-            SolutionName = replace(string(File),".mlx","Soln.mlx");
+            SolutionName = replace(string(File),".m","Soln.m");
             assert(exist(SolutionName,"file"),"Missing solutions for "+File);
-        end  
+        end
 
 
         function SmokeRun(testCase,File)
 
             % Navigate to project root folder:
             cd(testCase.RootFolder)
-            FileToRun = replace(string(File),".mlx","Soln.mlx");
+            FileToRun = replace(string(File),".m","Soln.m");
 
             % Pre-test:
             PreFiles = CheckPreFile(testCase,FileToRun);
@@ -106,12 +128,12 @@ function SmokeRun(testCase,File)
 
         end
 
-    end
-    
+    end % Test Methods
+
     methods (Access = private)
 
         function Path = CheckPreFile(testCase,Filename)
-            PreFile = "Pre"+replace(Filename,".mlx",".m");
+            PreFile = "Pre"+extractBefore(Filename,".m")+".m";
             PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -127,7 +149,7 @@ function SmokeRun(testCase,File)
         end
 
         function Path = CheckPostFile(testCase,Filename)
-            PostFile = "Post"+replace(Filename,".mlx",".m");
+            PostFile = "Post"+extractBefore(Filename,".m")+".m";
             PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
@@ -140,6 +162,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