changeset 6455:e68b6921b221

[project @ 2007-03-26 16:02:04 by jwe]
author jwe
date Mon, 26 Mar 2007 16:02:04 +0000
parents 7c9b4a6e090b
children 7f5316cadaa2
files scripts/ChangeLog scripts/testfun/assert.m
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Mon Mar 26 14:28:24 2007 +0000
+++ b/scripts/ChangeLog	Mon Mar 26 16:02:04 2007 +0000
@@ -1,3 +1,8 @@
+2007-03-26  Kim Hansen  <kimhanse@gmail.com>
+
+	* testfun/assert.m: Delete special check for empty objects.
+	Add test.
+
 2007-03-26  John W. Eaton  <jwe@octave.org>
 
 	* plot/drawnow.m: Exit early if call is recursive.
--- a/scripts/testfun/assert.m	Mon Mar 26 14:28:24 2007 +0000
+++ b/scripts/testfun/assert.m	Mon Mar 26 16:02:04 2007 +0000
@@ -118,9 +118,6 @@
       end
     endif
 
-  elseif (isempty (expected))
-    iserror = (any (size (cond) != size (expected)));
-
   elseif (ndims (cond) != ndims (expected)
 	  || any (size (cond) != size (expected)))
     iserror = 1;
@@ -197,6 +194,7 @@
 %!assert(zeros(3,0),zeros(3,0))
 %!error assert(zeros(3,0),zeros(0,2))
 %!error assert(zeros(3,0),[])
+%!fail("assert(zeros(2,0,2),zeros(2,0))", "Dimensions don't match")
 
 ## conditions
 %!assert(isempty([]))