From e444a33ef1c1fffa89ca36728c246b00d71e008e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
 <stephane.adjemian@univ-lemans.fr>
Date: Wed, 18 Nov 2015 09:56:58 +0100
Subject: [PATCH] Added unit tests and missing try catch block.

---
 src/@dates/sort.m  | 50 ++++++++++++++++++++++++++++++++++++++++------
 src/@dates/sort_.m | 26 ++++++++++++++++++------
 2 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/src/@dates/sort.m b/src/@dates/sort.m
index 2b2bda7..803df37 100644
--- a/src/@dates/sort.m
+++ b/src/@dates/sort.m
@@ -40,12 +40,50 @@ o.sort_();
 %$
 %$ % Call the tested routine.
 %$ d = dates(B1,B2,B3,B4);
-%$ c = d.sort();
+%$ try
+%$     c = d.sort();
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$ 
 %$ % Check the results.
-%$ t(1) = ~dassert(d.time,e.time);
-%$ t(2) = dassert(c.time,e.time);
-%$ t(3) = dassert(d.freq,e.freq);
-%$ t(4) = dassert(c.freq,e.freq);
+%$ if t(1)
+%$     t(2) = dassert(d.time,f.time);
+%$     t(3) = dassert(c.time,e.time);
+%$     t(4) = dassert(d.freq,e.freq);
+%$     t(5) = dassert(c.freq,e.freq);
+%$ end
 %$ T = all(t);
-%@eof:1
\ No newline at end of file
+%@eof:1
+
+%@test:2
+%$ % Define some dates
+%$ B1 = '1953Q4';
+%$ B2 = '1950Q2';
+%$ B3 = '1950Q1';
+%$ B4 = '1945Q3';
+%$
+%$ % Define expected results.
+%$ e.time = [1945 3; 1950 1; 1950 2; 1953 4];
+%$ e.freq = 4;
+%$ f.time = [1953 4; 1950 2; 1950 1; 1945 3];
+%$
+%$ % Call the tested routine.
+%$ d = dates(B1,B2,B3,B4);
+%$ try
+%$     c = sort(d);
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
+%$ 
+%$ % Check the results.
+%$ if t(1)
+%$     t(2) = dassert(d.time,f.time);
+%$     t(3) = dassert(c.time,e.time);
+%$     t(4) = dassert(d.freq,e.freq);
+%$     t(5) = dassert(c.freq,e.freq);
+%$ end
+%$ T = all(t);
+%@eof:2
\ No newline at end of file
diff --git a/src/@dates/sort_.m b/src/@dates/sort_.m
index 7b3f97e..08402e6 100644
--- a/src/@dates/sort_.m
+++ b/src/@dates/sort_.m
@@ -42,11 +42,18 @@ o.time = sortrows(o.time,[1,2]);
 %$
 %$ % Call the tested routine.
 %$ d = dates(B1,B2,B3,B4);
-%$ d.sort_();
+%$ try
+%$     d.sort_();
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$ 
 %$ % Check the results.
-%$ t(1) = dassert(d.time,e.time);
-%$ t(2) = dassert(d.freq,e.freq);
+%$ if t(1)
+%$     t(2) = dassert(d.time,e.time);
+%$     t(3) = dassert(d.freq,e.freq);
+%$ end
 %$ T = all(t);
 %@eof:1
 
@@ -63,10 +70,17 @@ o.time = sortrows(o.time,[1,2]);
 %$
 %$ % Call the tested routine.
 %$ d = dates(B1,B2,B3,B4);
-%$ c = sort_(d);
+%$ try
+%$     c = sort_(d);
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$ 
 %$ % Check the results.
-%$ t(1) = dassert(d.time,e.time);
-%$ t(2) = dassert(d.freq,e.freq);
+%$ if t(1)
+%$     t(2) = dassert(d.time,e.time);
+%$     t(3) = dassert(d.freq,e.freq);
+%$ end
 %$ T = all(t);
 %@eof:2
\ No newline at end of file
-- 
GitLab