From f0a1874487be5c99f3c9edf1ea79d6c52ddbb9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemia=20=28Scylla=29?= <stepan@dynare.org>
Date: Sat, 22 Dec 2018 10:55:41 +0100
Subject: [PATCH] Fixed unit tests (path issues for private functions).

---
 src/@dates/private/comparison_arg_checks.m | 28 +++++++++++-----------
 src/@dates/private/dates4display.m         | 16 ++++++-------
 src/@dates/private/greaterorequal.m        | 20 ++++++++--------
 src/@dates/private/greaterthan.m           | 20 ++++++++--------
 src/@dates/private/lessorequal.m           | 20 ++++++++--------
 src/@dates/private/lessthan.m              | 22 ++++++++---------
 tests/runalltests.m                        |  4 ++--
 7 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/@dates/private/comparison_arg_checks.m b/src/@dates/private/comparison_arg_checks.m
index a439bd1..b3ea15f 100644
--- a/src/@dates/private/comparison_arg_checks.m
+++ b/src/@dates/private/comparison_arg_checks.m
@@ -51,8 +51,8 @@ p = varargin{2};
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(1);
@@ -67,8 +67,8 @@ p = varargin{2};
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('make', 'my', 'day');
@@ -83,8 +83,8 @@ p = varargin{2};
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('punk', dates('1950Q1'));
@@ -99,8 +99,8 @@ p = varargin{2};
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), 1);
@@ -115,8 +115,8 @@ p = varargin{2};
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), dates('1950M1'));
@@ -131,8 +131,8 @@ p = varargin{2};
 
 %@test:6
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'):dates('1950Q2'), dates('1950Q1'):dates('1950Q3'));
@@ -147,8 +147,8 @@ p = varargin{2};
 
 %@test:7
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q2'), dates('1950Q1'));
diff --git a/src/@dates/private/dates4display.m b/src/@dates/private/dates4display.m
index 9630904..672ff78 100644
--- a/src/@dates/private/dates4display.m
+++ b/src/@dates/private/dates4display.m
@@ -49,8 +49,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -77,8 +77,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -105,8 +105,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -133,8 +133,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
diff --git a/src/@dates/private/greaterorequal.m b/src/@dates/private/greaterorequal.m
index 504414c..b7c1d85 100644
--- a/src/@dates/private/greaterorequal.m
+++ b/src/@dates/private/greaterorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/greaterthan.m b/src/@dates/private/greaterthan.m
index 38b4a32..cbcf9c3 100644
--- a/src/@dates/private/greaterthan.m
+++ b/src/@dates/private/greaterthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessorequal.m b/src/@dates/private/lessorequal.m
index ee71492..7fcfcde 100644
--- a/src/@dates/private/lessorequal.m
+++ b/src/@dates/private/lessorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessthan.m b/src/@dates/private/lessthan.m
index 570f1ac..578c2f3 100644
--- a/src/@dates/private/lessthan.m
+++ b/src/@dates/private/lessthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
@@ -142,4 +142,4 @@ end
 %$
 %$ T = all(t);
 %$ cd(OPATH);
-%@eof:5
+%@eof:5
\ No newline at end of file
diff --git a/tests/runalltests.m b/tests/runalltests.m
index d6cd65c..dcef8b9 100644
--- a/tests/runalltests.m
+++ b/tests/runalltests.m
@@ -35,10 +35,10 @@ unit_tests_root = strrep(which('runalltests'),'runalltests.m','');
 
 % Initialize the dseries module
 try
-    initialize_dseries_toolbox();
+    dseries.initialize();
 catch
     addpath([unit_tests_root '../src']);
-    initialize_dseries_toolbox();
+    dseries.initialize();
 end
 
 warning off
-- 
GitLab