fix coverage

Author: Remi-Gau

Makefile

@@ -1,17 +1,15 @@
 # TODO make more general to use the local matlab version
-MATLAB = /usr/local/MATLAB/R2017a/bin/matlab
+MATLAB = /usr/local/MATLAB/R2018a/bin/matlab
 ARG    = -nodisplay -nosplash -nodesktop
 
-<<<<<<< HEAD
-=======
-.PHONY: clean manual clean_demos fix_submodule
-clean: clean_demos
+
+.PHONY: clean manual fix_submodule
+clean:
 	rm -rf version.txt
 
 fix_submodule:
 	git submodule update --init --recursive && git submodule update --recursive
 
->>>>>>> 3a67904c66439e90c8fc528ac8729254b91d56d6
 lint:
 	mh_style --fix && mh_metric --ci && mh_lint
 

cpp_bids.m

@@ -35,6 +35,16 @@ function cpp_bids(varargin)
         case 'init'
 
             initCppBids(verbose);
+            
+        case 'dev'
+
+            initCppBids(verbose);
+            thisDirectory = fileparts(mfilename('fullpath'));
+            testFolder = fullfile(thisDirectory, 'tests');
+            addpath(testFolder, '-begin');
+            utilFolder = fullfile(thisDirectory, 'tests', 'utils');
+            addpath(utilFolder, '-begin');
+            
 
         case 'uninit'
 
@@ -75,10 +85,10 @@ function initCppBids(verbose)
         CPP_BIDS_PATHS = cat(2, CPP_BIDS_PATHS, ...
                              pathSep, ...
                              genpath(fullfile(thisDirectory, 'src')));
-        assert(isdir(fullfile(thisDirectory, 'lib', 'bids-matlab', '+bids')));
+        assert(isfolder(fullfile(thisDirectory, 'lib', 'bids-matlab', '+bids')));
         CPP_BIDS_PATHS = cat(2, CPP_BIDS_PATHS, pathSep, ...
                              fullfile(thisDirectory, 'lib', 'bids-matlab'));
-        assert(isdir(fullfile(thisDirectory, 'lib', 'JSONio')));
+        assert(isfolder(fullfile(thisDirectory, 'lib', 'JSONio')));
         CPP_BIDS_PATHS = cat(2, CPP_BIDS_PATHS, pathSep, ...
                              fullfile(thisDirectory, 'lib', 'JSONio'));
 

runTests.m

@@ -14,15 +14,10 @@ function runTests()
     warning off;
     more off;
 
-    addpath(fullfile(thisPath, 'lib', 'JSONio'));
-    addpath(fullfile(thisPath, 'lib', 'bids-matlab'));
+    cpp_bids('dev');
 
     folderToCover = fullfile(thisPath, 'src');
-    addpath(genpath(folderToCover));
     testFolder = fullfile(thisPath, 'tests');
-    addpath(testFolder);
-
-    addpath(fullfile(testFolder, 'utils'));
 
     success = moxunit_runtests(testFolder, ...
                                '-verbose', '-recursive', '-with_coverage', ...