as3/test/asunit/framework/AssertThrowsTest.as @@ -98,16 +98,17 @@ package asunit.framework { * </listing> **/ static public function assertThrows(errorType:Class, block:Function):void { - try { - block.call(); - throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType) + "> but none was thrown." ); - } - catch(e:Error) { - if(!(e is errorType)) { - throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType) + try { + block.call(); + } + catch(e:Error) { + if(!(e is errorType)) { + throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType) +"> but was:<" + getQualifiedClassName(e) + ">"); - } - } + } + return; + } + throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType) + "> but none was thrown." ); } /** as3/src/asunit/framework/Assert.as @@ -3,6 +3,7 @@ package asunit.framework { import asunit.framework.AssertEqualsArraysIgnoringOrderTest; import asunit.framework.AssertEqualsArraysTest; import asunit.framework.AssertTest; + import asunit.framework.AssertThrowsTest; import asunit.framework.AsyncFailureTest; import asunit.framework.AsyncMethodTest; import asunit.framework.TestCaseTest; @@ -15,6 +16,7 @@ package asunit.framework { addTest(new asunit.framework.AssertEqualsArraysIgnoringOrderTest()); addTest(new asunit.framework.AssertEqualsArraysTest()); addTest(new asunit.framework.AssertTest()); + addTest(new asunit.framework.AssertThrowsTest()); addTest(new asunit.framework.AsyncFailureTest()); addTest(new asunit.framework.AsyncMethodTest()); addTest(new asunit.framework.TestCaseTest()); as3/test/asunit/framework/AllTests.as 861047d26c531a63e7ac698ee4b094ddeac605df Robert Penner info@robertpenner.com http://github.com/lukebayes/asunit/commit/611f7c97e67cacd06c01468cac3c7bc58fa6f9b7 611f7c97e67cacd06c01468cac3c7bc58fa6f9b7 2009-11-03T19:55:27-08:00 2009-11-03T19:55:27-08:00 FIX: assertThrows() was showing wrong message when the function didn't throw anything. fb0927372b4ccff18df10ebcd04e8df39369035c Robert Penner info@robertpenner.com