Commit 350f7195 authored by jayd1860's avatar jayd1860
Browse files

-- Change unit test to use global config variable rather than opening/closing... 

-- Change unit test to use global config variable rather than opening/closing ConfigFileClass objects
-- Update getVernum to match AV
-- Update submodule references
parent de6ac0c2

DataTree @ 4d8cb662

Compare dd3b49d0 to 4d8cb662
Original line number Diff line number Diff line 
Subproject commit dd3b49d002ab599bc86da0212f79ce445602fcde
 
Subproject commit 4d8cb6623f76d4e1953e398890ecf807ba9d0887

UnitTests/CleanUp.m

+4 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ global QUICK_TEST 
global procStreamStyle

global testidx;

global logger

global cfg

global maingui



if ~exist('standalone','var') || isempty(standalone)
@@ -52,11 +53,10 @@ end 
fclose all;



% Create or restore config file

c = ConfigFileClass();

if c.BackupExists()

    c.Restore()

if cfg.BackupExists()

    cfg.Restore()

else

    c.Save('backup');

    cfg.Save('backup');

end



if ~start

UnitTests/UnitTestsAll.m

+8 −8
Original line number Diff line number Diff line 
function UnitTestsAll()

global logger



global cfg 

t_local = tic;



setNamespace('Homer3')
@@ -10,17 +10,17 @@ CleanUp(true); 
cleanupObj = onCleanup(@()userInterrupt_Callback(true));



logger = Logger('UnitTestsAll');

cfg = ConfigFileClass();



c = ConfigFileClass();

c.SetValue('Regression Test Active','true');

cfg.SetValue('Regression Test Active','true');



c.SetValue('Include Archived User Functions','Yes');

c.SetValue('Default Processing Stream Style','NIRS');

c.Save();

cfg.SetValue('Include Archived User Functions','Yes');

cfg.SetValue('Default Processing Stream Style','NIRS');

cfg.Save();

% UnitTestsAll_Nirs(false);



c.SetValue('Default Processing Stream Style','SNIRF');

c.Save();

cfg.SetValue('Default Processing Stream Style','SNIRF');

cfg.Save();

UnitTestsAll_Snirf(false);

UnitTestsAll_MainGUI(false)

UnitTests/UnitTestsAll_MainGUI.m

+4 −4
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ userInterrupt(standalone) 


% ---------------------------------------------------

function configureAppSettings()

c = ConfigFileClass();

c.SetValue('Regression Test Active','true');

c.SetValue('Default Processing Stream Style','SNIRF');

c.Save();

global cfg

cfg.SetValue('Regression Test Active','true');

cfg.SetValue('Default Processing Stream Style','SNIRF');

cfg.Save();

UnitTests/UnitTestsAll_Snirf.m

+4 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ userInterrupt(standalone) 


% ---------------------------------------------------

function configureAppSettings()

c = ConfigFileClass();

c.SetValue('Regression Test Active','true');

c.SetValue('Default Processing Stream Style','SNIRF');

c.Save();
 
global cfg

cfg.SetValue('Regression Test Active','true');

cfg.SetValue('Default Processing Stream Style','SNIRF');

cfg.Save();

CRA Git | Maintained and supported by SUSTech CRA and CCSE