Revision: 2224
http://vexi.svn.sourceforge.net/vexi/?rev=2224&view=rev
Author: clrg
Date: 2007-09-16 05:09:29 -0700 (Sun, 16 Sep 2007)
Log Message:
-----------
Add extra comparison functions to vunit
Modified Paths:
--------------
trunk/widgets/org.vexi.vunit/src/vexi/test/vunit.t
Modified: trunk/widgets/org.vexi.vunit/src/vexi/test/vunit.t
===================================================================
--- trunk/widgets/org.vexi.vunit/src/vexi/test/vunit.t 2007-09-16 02:56:03 UTC
(rev 2223)
+++ trunk/widgets/org.vexi.vunit/src/vexi/test/vunit.t 2007-09-16 12:09:29 UTC
(rev 2224)
@@ -153,29 +153,70 @@
};
- //////////
- // Assertion stuff
- ///////
- static.assertEquals = function(expected,actual){
- if(expected !=actual){
- throw "Expected: '" + expected + "'\n" +
- "Actual: '" + actual +"'";
- }
- }
-
+ //////////
+ // Assertion stuff
+ ///////
+
+ // Generic equals assertion
+ static.assertEquals = function(expected, actual) {
+ if (expected != actual) {
+ throw "== assertion failed...\n" +
+ "Expected: '" + expected + "'\n" +
+ "Actual: '" + actual + "' (" + typeof(actual) + ")";
+ }
+ }
+
// For floats
- static.assertApproxEquals = function(expected,actual,roughness){
- var diff = (expected - actual);
- if(roughness){
- if(vexi.math.abs(diff) > roughness){
- throw "Expected: " + expected + " +/- " + roughness + "\n"
+
- "Actual: " + actual +"";
- }
- }else if(diff*1000000>1){
- throw "Expected: ~" + expected + "\n" +
- "Actual: " + actual +"";
- }
- }
+ static.assertApproxEquals = function(expected, actual, roughness) {
+ var diff = (expected - actual);
+ if (arguments.length > 2) {
+ if(vexi.math.abs(diff) > roughness) {
+ throw "~= assertion failed...\n" +
+ "Expected: " + expected + " +/- " + roughness + "\n" +
+ "Actual: " + actual;
+ }
+ } else if(diff*1000000>1) {
+ throw "~= assertion failed...\n" +
+ "Expected: ~" + expected + "\n" +
+ "Actual: " + actual +"";
+ }
+ }
+
+ // Less-than comparison
+ static.assertGreaterThan = function(exp_gt, actual) {
+ if (actual >= exp_gt) {
+ throw "> assertion failure...\n" +
+ "Expected: > " + exp_gt + "\n" +
+ "Actual: " + actual + " (" + typeof(actual) + ")";
+ }
+ }
+
+ // Less-than comparison
+ static.assertGreaterThanEquals = function(exp_gte, actual) {
+ if (actual > exp_gte) {
+ throw ">= assertion failure...\n" +
+ "Expected: >= " + exp_gte + "\n" +
+ "Actual: " + actual + " (" + typeof(actual) + ")";
+ }
+ }
+
+ // Greater-than comparison
+ static.assertLessThan = function(exp_less, actual) {
+ if (exp_less >= actual) {
+ throw "< assertion failure...\n" +
+ "Expected: < " + exp_less + "\n" +
+ "Actual: " + actual + " (" + typeof(actual) + ")";
+ }
+ }
+
+ // Greater-than comparison
+ static.assertLessThanEquals = function(exp_lte, actual) {
+ if (exp_lte > actual) {
+ throw "< assertion failure...\n" +
+ "Expected: <= " + exp_lte + "\n" +
+ "Actual: " + actual + " (" + typeof(actual) + ")";
+ }
+ }
<ui:box>
thisbox.assertEquals = static.assertEquals;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
