Take an optional integer parameter to ./run-tests.m to loop more than once.

[octave.git] / run-tests.m

diff --git a/run-tests.m b/run-tests.m
index 2ad4c2462b06f1203134c5576aaecde217db9f98..001e7409d00004d7cdc85a2e676cb29c9aa8e2f8 100755 (executable)
--- a/run-tests.m
+++ b/run-tests.m
@@ -1,117 +1,32 @@
 #!/usr/bin/octave --silent
+#
+# You'll need to use the .octaverc in this directory to get the proper
+# paths. You can pass it an integer on the command-line to specify how
+# many times we should run the test suite in succession. The default
+# is 1.
+#
 
-unit_init(1, {});
-
-unit_test_equals("sin[0] == 0", ...
-                0, ...
-                divided_difference(@sin, 0));
-
-unit_test_equals("sin[0, pi] == 0", ...
-                0, ...
-                divided_difference(@sin, [0,pi]));
-
-unit_test_equals("sin[0, pi, 2*pi] == 0", ...
-                0, ...
-                divided_difference(@sin, [0,pi,2*pi]));
-
-unit_test_equals("zero order divided_difference_coefficients", ...
-                [1], ...
-                divided_difference_coefficients([0]));
-
-unit_test_equals("first order divided_difference_coefficients", ...
-                [-1, 1] / pi, ...
-                divided_difference_coefficients([0, pi]));
-
-unit_test_equals("second order divided_difference_coefficients", ...
-                [1, -2, 1] / (2*pi^2), ...
-                divided_difference_coefficients([0, pi, 2*pi]));
-
-
-unit_test_equals("1 is odd", ...
-                true, ...
-                odd(1));
-
-unit_test_equals("1 is not even", ...
-                false, ...
-                even(1));
-
-unit_test_equals("2 is not odd", ...
-                false, ...
-                odd(2));
-
-unit_test_equals("2 is even", ...
-                true, ...
-                even(2));
-
-expected_A = [-1, 0, 0, 0, 0; ...
-              -16, 32,  -16,  0,  0; ...
-             0,   -16, 32,  -16, 0; ...
-             0,   0,   -16, 32, -16; ...
-             0,   0,   0,   0,  -1];
-unit_test_equals("Homework #1 problem #1 Poisson matrix is correct", ...
-                true, ...
-                expected_A == poisson_matrix(4, 0, 1));
-
-
-g = @(x) 1 + atan(x);
-expected_fp = 2.1323;
-tol = 1 / 10^10;
-x0 = 2.4;
-unit_test_equals("Homework #2 problem #5 fixed point is correct", ...
-                expected_fp, ...
-                fixed_point_method(g, tol, x0));
-
-
-h = 0.5;
-g1 = @(u) 1 + h*exp(-u(1)^2)/(1+u(2)^2);
-g2 = @(u) 0.5 + h*atan(u(1)^2 + u(2)^2);
-my_g = @(u) [g1(u), g2(u)];
-tol = 1 / 10^9;
-u0 = [1,1];
-expected_fp = [1.0729, 1.0821];
-unit_test_equals("Homework #3 problem #3i fixed point is correct", ...
-                expected_fp, ...
-                fixed_point_method(my_g, tol, u0));
-
-
-f = @(x) x^6 - x - 1;
-f_prime = @(x) 6*x^5 - 1;
-tol = 1/1000000;
-x0 = 2;
-expected_root = 1.1347;
-unit_test_equals("Newton's method agrees with Haskell", ...
-                expected_root, ...
-                newtons_method(f, f_prime, tol, x0));
+addpath('./unit_test');
 
+global unittest_results;
 
+unit_init(1, {});
 
-f1 = @(u) u(1)^2 + u(1)*u(2)^3 - 9;
-f2 = @(u) 3*u(1)^2*u(2) - u(2)^3 - 4;
-f = @(u) [f1(u); f2(u)];
-## The partials for the Jacobian.
-f1x = @(u) 2*u(1) + u(2)^3;
-f1y = @(u) 3*u(1)*u(2)^2;
-f2x = @(u) 6*u(1)*u(2);
-f2y = @(u) 3*u(1)^2 - 3*u(2)^2;
-## f_prime == Jacobian.
-f_prime = @(u) [ f1x(u), f1y(u); f2x(u), f2y(u) ];
-tol = 1 / 10^12;
-u0 = [1.2; 2.5];
-expected_root = [1.33635; 1.75424];
-[actual_root, iterations] = newtons_method(f, f_prime, tol, u0);
-unit_test_equals("Homework #3 problem #4 root is correct", ...
-                expected_root, ...
-                actual_root);
+test_files = glob('tests/*.m');
 
+loop_count = 1;
+arg_list = argv();
+if (length(arg_list) > 0)
+  loop_count = arg_list{1};
+end
 
+## Source every file that matches the glob above.
+for idx = [ 1 : loop_count ]
+  cellfun(@source, test_files);
+end
 
-f = @(x,y) y;
-x0 = 0;
-y0 = 1;
-h = 1;
-actual_y = forward_euler1(x0, y0, f, h);
-expected_y = 2;
 
-unit_test_equals("Forward Euler works for one step", ...
-                expected_y, ...
-                actual_y);
+fprintf('\n');
+fprintf('Total tests attempted: %d\n', unittest_results.total);
+fprintf('Total tests passed: %d\n', unittest_results.pass);
+fprintf('Total tests failed: %d\n', unittest_results.fail);