changeset 11639:f2dd6a3d0284 octave-forge

Temporarily commented out tests in private subdir (bug #38755)
author prnienhuis
date Fri, 19 Apr 2013 11:41:53 +0000
parents fa3590906cc5
children f6b26a52b9a1
files main/io/inst/private/chk_jar_entries.m main/io/inst/private/parse_sp_range.m main/io/inst/private/spsh_prstype.m
diffstat 3 files changed, 43 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/inst/private/chk_jar_entries.m	Wed Apr 17 20:23:54 2013 +0000
+++ b/main/io/inst/private/chk_jar_entries.m	Fri Apr 19 11:41:53 2013 +0000
@@ -58,18 +58,20 @@
 
 endfunction
 
-%!test
-%! entries = {"abc", {"def", "ghi"}, "jkl"};
-%! jcp1 = {"/usr/lib/java/abcx.jar", "/usr/lib/java/defz.jar", "/usr/lib/java/jkl3.jar"};
-%! jcp1 = strrep (jcp1, "/", filesep);
-%! assert (chk_jar_entries (jcp1, entries), 3);
-
-%!test
-%! entries = {"abc", {"def", "ghi"}, "xyz"};
-%! jcp2 = {"/usr/lib/java/abcy.jar", "/usr/lib/java/ghiw.jar", "/usr/lib/java/jkl6.jar"};
-%! jcp2 = strrep (jcp2, "/", filesep);
-%! [aaa, bbb] = chk_jar_entries (jcp2, entries);
-%! assert (aaa, 2);
-%! assert (bbb, [0 0 1]);
+## FIXME -- reinstate these tests one there if a way is found to test private
+##          functions directly
+##%!test
+##%! entries = {"abc", {"def", "ghi"}, "jkl"};
+##%! jcp1 = {"/usr/lib/java/abcx.jar", "/usr/lib/java/defz.jar", "/usr/lib/java/jkl3.jar"};
+##%! jcp1 = strrep (jcp1, "/", filesep);
+##%! assert (chk_jar_entries (jcp1, entries), 3);
+##
+##%!test
+##%! entries = {"abc", {"def", "ghi"}, "xyz"};
+##%! jcp2 = {"/usr/lib/java/abcy.jar", "/usr/lib/java/ghiw.jar", "/usr/lib/java/jkl6.jar"};
+##%! jcp2 = strrep (jcp2, "/", filesep);
+##%! [aaa, bbb] = chk_jar_entries (jcp2, entries);
+##%! assert (aaa, 2);
+##%! assert (bbb, [0 0 1]);
 
 
--- a/main/io/inst/private/parse_sp_range.m	Wed Apr 17 20:23:54 2013 +0000
+++ b/main/io/inst/private/parse_sp_range.m	Fri Apr 19 11:41:53 2013 +0000
@@ -99,18 +99,20 @@
   
 endfunction
 
-%!test
-%! [a b c d e] = parse_sp_range ('A1:B2');
-%! assert ([a b c d e], ['A1', 2, 2, 1, 1]);
-
-%!test
-%! [a b c d e] = parse_sp_range ('A1:AB200');
-%! assert ([a b c d e], ['A1', 200, 28, 1, 1]);
-
-%!test
-%! [a b c d e] = parse_sp_range ('cd230:iY65536');
-%! assert ([a b c d e], ['CD230', 65307, 178, 230, 82]);
-
-%!test
-%! [a b c d e] = parse_sp_range ('BvV12798 : xFd1054786');
-%! assert ([b c d e], [1041989, 14439, 12798, 1946]);
+## FIXME -- reinstate these tests one there if a way is found to test private
+##          functions directly
+##%!test
+##%! [a b c d e] = parse_sp_range ('A1:B2');
+##%! assert ([a b c d e], ['A1', 2, 2, 1, 1]);
+##
+##%!test
+##%! [a b c d e] = parse_sp_range ('A1:AB200');
+##%! assert ([a b c d e], ['A1', 200, 28, 1, 1]);
+##
+##%!test
+##%! [a b c d e] = parse_sp_range ('cd230:iY65536');
+##%! assert ([a b c d e], ['CD230', 65307, 178, 230, 82]);
+##
+##%!test
+##%! [a b c d e] = parse_sp_range ('BvV12798 : xFd1054786');
+##%! assert ([b c d e], [1041989, 14439, 12798, 1946]);
--- a/main/io/inst/private/spsh_prstype.m	Wed Apr 17 20:23:54 2013 +0000
+++ b/main/io/inst/private/spsh_prstype.m	Fri Apr 19 11:41:53 2013 +0000
@@ -81,12 +81,14 @@
 
 endfunction
 
-%!test
-%! tstobj = {1.5, true, []; 'Text1', '=A1+B1', '=SQRT(A1)'; NaN, {}, 0};
-%! typarr = spsh_prstype (tstobj, 3, 3, [1 2 3 4 5], struct ("formulas_as_text", 0));
-%! assert (typarr, [1 2 5; 3 4 4; 5 5 1]);
-
-%!test
-%! tstobj = {1.5, true, []; 'Text1', '=A1+B1', '=SQRT(A1)'; NaN, {}, 0};
-%! typarr = spsh_prstype (tstobj, 3, 3, [1 2 3 4 5], struct ("formulas_as_text", 1));
-%! assert (typarr, [1 2 5; 3 3 3; 5 5 1]);
+## FIXME -- reinstate these tests one there if a way is found to test private
+##          functions directly
+## %!test
+##%! tstobj = {1.5, true, []; 'Text1', '=A1+B1', '=SQRT(A1)'; NaN, {}, 0};
+##%! typarr = spsh_prstype (tstobj, 3, 3, [1 2 3 4 5], struct ("formulas_as_text", 0));
+##%! assert (typarr, [1 2 5; 3 4 4; 5 5 1]);
+##
+##%!test
+##%! tstobj = {1.5, true, []; 'Text1', '=A1+B1', '=SQRT(A1)'; NaN, {}, 0};
+##%! typarr = spsh_prstype (tstobj, 3, 3, [1 2 3 4 5], struct ("formulas_as_text", 1));
+##%! assert (typarr, [1 2 5; 3 3 3; 5 5 1]);