Fixes live script and removes incorrect path from custom file in live…

… script
RascalSoftware · Nov 27, 2024 · 1235bc3 · 1235bc3
1 parent 9c6841c
commit 1235bc3
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 14 deletions.
diff --git a/examples/domains/customLayers/domainsCustomLayersSheet.mlx b/examples/domains/customLayers/domainsCustomLayersSheet.mlx
diff --git a/examples/domains/customXY/domainsCustomXYSheet.mlx b/examples/domains/customXY/domainsCustomXYSheet.mlx
diff --git a/examples/domains/standardLayers/domainsStandardLayersSheet.mlx b/examples/domains/standardLayers/domainsStandardLayersSheet.mlx
diff --git a/examples/miscellaneous/alternativeLanguages/customModelLanguagesSheet.mlx b/examples/miscellaneous/alternativeLanguages/customModelLanguagesSheet.mlx
diff --git a/examples/miscellaneous/alternativeLanguages/orsoDSPCCustomLayers.m b/examples/miscellaneous/alternativeLanguages/orsoDSPCCustomLayers.m
@@ -59,9 +59,10 @@
 % them in the data block....
 
 % Read in the datafiles
-D2O_data = dlmread('c_PLP0016596.dat');
-SMW_data = dlmread('c_PLP0016601.dat');
-H2O_data = dlmread('c_PLP0016607.dat');
+root = getappdata(0, 'root');
+D2O_data = dlmread(fullfile(root, '/examples/normalReflectivity/customLayers/c_PLP0016596.dat'));
+SMW_data = dlmread(fullfile(root, '/examples/normalReflectivity/customLayers/c_PLP0016601.dat'));
+H2O_data = dlmread(fullfile(root, '/examples/normalReflectivity/customLayers/c_PLP0016607.dat'));
 
 % Add the data to the project
 problem.addData('Bilayer / D2O', D2O_data(:,1:3));
@@ -77,7 +78,7 @@
 % 
 % Add the custom file to the project....
 
-problem.addCustomFile('DSPC Model','customBilayer.m','matlab',pwd);
+problem.addCustomFile('DSPC Model','customBilayer.m','matlab');
 %% 
 % 
 % 

diff --git a/examples/miscellaneous/convertRascal1Project/convertRascal.mlx b/examples/miscellaneous/convertRascal1Project/convertRascal.mlx
diff --git a/examples/miscellaneous/roundRobin/roundRobin.mlx b/examples/miscellaneous/roundRobin/roundRobin.mlx
diff --git a/examples/normalReflectivity/customLayers/customLayersDSPCSheet.mlx b/examples/normalReflectivity/customLayers/customLayersDSPCSheet.mlx
diff --git a/examples/normalReflectivity/customXY/customXYDSPCSheet.mlx b/examples/normalReflectivity/customXY/customXYDSPCSheet.mlx
diff --git a/examples/normalReflectivity/standardLayers/standardLayersDSPCSheet.mlx b/examples/normalReflectivity/standardLayers/standardLayersDSPCSheet.mlx
diff --git a/tests/ORSO/testORSOValidation.m b/tests/ORSO/testORSOValidation.m
@@ -24,6 +24,12 @@ function testORSO(testCase, layersFile, dataFile)
 
     end
 
+    methods (TestClassTeardown)
+       function clear(~)
+           close all  % Close figure after run
+       end
+    end
+
     methods (Static)
 
         function out = orsoTest(layersFile, dataFile)

diff --git a/tests/testExamples.m b/tests/testExamples.m
@@ -76,6 +76,17 @@ function testCleanUp(testCase)
         end
     end
 
+
+    methods(Static)
+        function setupCurrentDir(testCase, scriptFile)
+            import matlab.unittest.fixtures.CurrentFolderFixture
+
+            [pwdPath, ~, ~] = fileparts(which(scriptFile));
+            testCase.applyFixture(CurrentFolderFixture(pwdPath))  
+        end
+    end
+
+
     methods (Test,ParameterCombination="sequential")
         % Runs the different examples sequentially
         function testScriptExamples(testCase, ...
@@ -93,11 +104,7 @@ function testScriptExamples(testCase, ...
 
             % verifies example exists with .m extension
             testCase.verifyEqual(exist(exampleScriptFile,'file'), 2);
-            import matlab.unittest.fixtures.CurrentFolderFixture
-
-            [pwdPath, ~, ~] = fileparts(which(exampleScriptFile));
-            testCase.applyFixture(CurrentFolderFixture(pwdPath))  
-
+            testExamples.setupCurrentDir(testCase, exampleScriptFile)
             % runs the example file
             evalc(exampleScriptFile);
 
@@ -126,8 +133,9 @@ function testScriptExamples(testCase, ...
             close all;
         end
 
-        function testLiveScriptExamples(~, exampleLiveScriptFile)
+        function testLiveScriptExamples(testCase, exampleLiveScriptFile)
             % runs the example live script file
+            testExamples.setupCurrentDir(testCase, exampleLiveScriptFile)  
             evalc(exampleLiveScriptFile);
             close all;
         end
@@ -137,10 +145,7 @@ function testWriteScript(testCase, exampleScriptFile)
             % to a script that can regenerate the object
             % verifies example exists with .m extension
             testCase.verifyEqual(exist(exampleScriptFile,'file'), 2);
-            import matlab.unittest.fixtures.CurrentFolderFixture
-
-            [pwdPath, ~, ~] = fileparts(which(exampleScriptFile));
-            testCase.applyFixture(CurrentFolderFixture(pwdPath))  
+            testExamples.setupCurrentDir(testCase, exampleScriptFile)  
 
             % runs the example file
             evalc(exampleScriptFile);