[Pkg-octave-commit] [SCM] Debian packaging for octave-statistics branch, master, updated. debian/1.2.0-1-2-gb70af7c

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit c501c167a6628a268ee88bfb79031b28dca2bc4d
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed May 15 18:07:52 2013 +0200

    expose-tbl-delim-tests.patch: new patch, makes sure tbl_delim.m is tested
    
    Closes: #672756

diff --git a/debian/patches/expose-tbl-delim-tests.patch b/debian/patches/expose-tbl-delim-tests.patch
new file mode 100644
index 0000000..57bb706
--- /dev/null
+++ b/debian/patches/expose-tbl-delim-tests.patch
@@ -0,0 +1,156 @@
+Description: Expose the tests of the private function tbl_delim
+Author: Rafael Laboissière <rafael at laboissiere.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672756
+Forwarded: no
+Last-Update: 2012-05-30
+--- a/inst/tblwrite.m
++++ b/inst/tblwrite.m
+@@ -84,6 +84,87 @@
+ endfunction
+ 
+ ## Tests
++%!shared privpath
++%! privpath = [fileparts(which('tblwrite')) filesep() 'private'];
++## Tests for tbl_delim (private function)
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim (" ");
++%! assert (d, " ");
++%! assert (err, "");
++%! rmpath (privpath);
++## Named delimiters
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("space");
++%! assert (d, " ");
++%! assert (err, "");
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("tab");
++%! assert (d, sprintf ("\t"));
++%! assert (err, "");
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("comma");
++%! assert (d, ",");
++%! assert (err, "");
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("semi");
++%! assert (d, ";");
++%! assert (err, "");
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("bar");
++%! assert (d, "|");
++%! assert (err, "");
++%! rmpath (privpath);
++## An arbitrary character
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("x");
++%! assert (d, "x");
++%! assert (err, "");
++%! rmpath (privpath);
++## An arbitrary escape string
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ('\r');
++%! assert (d, sprintf ('\r'))
++%! assert (err, "");
++%! rmpath (privpath);
++## Errors
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("bars");
++%! assert (isnan (d));
++%! assert (! isempty (err));
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ("");
++%! assert (isnan (d));
++%! assert (! isempty (err));
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim (5);
++%! assert (isnan (d));
++%! assert (! isempty (err));
++%! rmpath (privpath);
++%!test
++%! addpath (privpath,'-end')
++%! [d err] = tbl_delim ({"."});
++%! assert (isnan (d));
++%! assert (! isempty (err));
++%! rmpath (privpath);
++##
++## Tests for tblwrite
+ %!shared d, v, c
+ %! d = [1 2;3 4];
+ %! v = ["a ";"bc"];
+--- a/inst/private/tbl_delim.m
++++ b/inst/private/tbl_delim.m
+@@ -69,58 +69,3 @@
+   endif
+ 
+ endfunction
+-
+-## Tests
+-## The defaults
+-%!test
+-%! [d err] = tbl_delim (" ");
+-%! assert (d, " ");
+-%! assert (err, "");
+-## Named delimiters
+-%!test
+-%! [d err] = tbl_delim ("space");
+-%! assert (d, " ");
+-%! assert (err, "");
+-%!test
+-%! [d err] = tbl_delim ("tab");
+-%! assert (d, sprintf ("\t"));
+-%! assert (err, "");
+-%!test
+-%! [d err] = tbl_delim ("comma");
+-%! assert (d, ",");
+-%! assert (err, "");
+-%!test
+-%! [d err] = tbl_delim ("semi");
+-%! assert (d, ";");
+-%! assert (err, "");
+-%!test
+-%! [d err] = tbl_delim ("bar");
+-%! assert (d, "|");
+-%! assert (err, "");
+-## An arbitrary character
+-%!test
+-%! [d err] = tbl_delim ("x");
+-%! assert (d, "x");
+-%! assert (err, "");
+-## An arbitrary escape string
+-%!test
+-%! [d err] = tbl_delim ('\r');
+-%! assert (d, sprintf ('\r'))
+-%! assert (err, "");
+-## Errors
+-%!test
+-%! [d err] = tbl_delim ("bars");
+-%! assert (isnan (d));
+-%! assert (! isempty (err));
+-%!test
+-%! [d err] = tbl_delim ("");
+-%! assert (isnan (d));
+-%! assert (! isempty (err));
+-%!test
+-%! [d err] = tbl_delim (5);
+-%! assert (isnan (d));
+-%! assert (! isempty (err));
+-%!test
+-%! [d err] = tbl_delim ({"."});
+-%! assert (isnan (d));
+-%! assert (! isempty (err));
diff --git a/debian/patches/series b/debian/patches/series
index a2204a5..ae1e6cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 data-files-for-tests.diff
 autoload-yes.patch
+expose-tbl-delim-tests.patch

-- 
Debian packaging for octave-statistics