From 738413a1670b35da0d7e07675eaa0648b8c1df24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemia=20=28Scylla=29?= <stepan@dynare.org> Date: Sun, 27 Jan 2019 22:45:03 +0100 Subject: [PATCH] Fixed URLs (unit tests). --- src/@dseries/dseries.m | 24 ++++++++++++------------ src/@dseries/subsref.m | 4 ++-- src/read/load_csv_file_data.m | 4 ++-- src/utilities/str/name2tex.m | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/@dseries/dseries.m b/src/@dseries/dseries.m index 11ea041..c90516d 100644 --- a/src/@dseries/dseries.m +++ b/src/@dseries/dseries.m @@ -59,7 +59,7 @@ function ts = dseries(varargin) % --*-- Unitary tests --*-- %! @end deftypefn %@eod: -% Copyright (C) 2011-2017 Dynare Team +% Copyright (C) 2011-2019 Dynare Team % % This file is part of Dynare. % @@ -276,7 +276,7 @@ end %$ t = zeros(6,1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m'); %$ if ~status %$ error() %$ end @@ -302,7 +302,7 @@ end %$ t = zeros(6,1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat'); %$ if ~status %$ error() %$ end @@ -328,7 +328,7 @@ end %$ t = zeros(8,1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); %$ if ~status %$ error() %$ end @@ -424,9 +424,9 @@ end %@test:9 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls'); %$ end %$ if ~status %$ error() @@ -459,9 +459,9 @@ end %@test:10 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls'); %$ end %$ if ~status %$ error() @@ -494,9 +494,9 @@ end %@test:11 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls'); %$ end %$ if ~status %$ error() @@ -529,9 +529,9 @@ end %@test:12 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls'); %$ end %$ if ~status %$ error() diff --git a/src/@dseries/subsref.m b/src/@dseries/subsref.m index 4ff4837..009799b 100644 --- a/src/@dseries/subsref.m +++ b/src/@dseries/subsref.m @@ -45,7 +45,7 @@ function B = subsref(A, S) % --*-- Unitary tests --*-- %! @end deftypefn %@eod: -% Copyright (C) 2011-2017 Dynare Team +% Copyright (C) 2011-2019 Dynare Team % % This file is part of Dynare. % @@ -353,7 +353,7 @@ end %$ t = zeros(5,1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); %$ if ~status %$ error() %$ end diff --git a/src/read/load_csv_file_data.m b/src/read/load_csv_file_data.m index 32b6b52..7ef093c 100644 --- a/src/read/load_csv_file_data.m +++ b/src/read/load_csv_file_data.m @@ -16,7 +16,7 @@ function [freq, init, data, varlist] = load_csv_file_data(file) % --*-- Unitary % names. Similarly, if the first column does not contain dates, then % freq will be 1 and init will be year 1. -% Copyright (C) 2012-2017 Dynare Team +% Copyright (C) 2012-2019 Dynare Team % % This file is part of Dynare. % @@ -199,7 +199,7 @@ varlist = strrep(varlist,'"',''); %@test:1 %$ % Download csv file with data. -%$ urlwrite('http://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv'); +%$ urlwrite('https://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv'); %$ %$ % Instantiate a dseries from the data in the csv file. %$ try diff --git a/src/utilities/str/name2tex.m b/src/utilities/str/name2tex.m index 12dadc5..bd13277 100644 --- a/src/utilities/str/name2tex.m +++ b/src/utilities/str/name2tex.m @@ -11,7 +11,7 @@ function tex = name2tex(name, info) % --*-- Unitary tests --*-- % OUTPUTS % - tex [string or cell of strings] -% Copyright (C) 2012-2017 Dynare Team +% Copyright (C) 2012-2019 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -189,7 +189,7 @@ end %@test:4 %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dd.csv','dd.csv'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dd.csv','dd.csv'); %$ if ~status %$ error() %$ end -- GitLab