Browse Source

TestCase: fix order of arguments in >>assert:equals:

Manfred Kroehnert 12 years ago
parent
commit
d83b55a161
3 changed files with 10 additions and 10 deletions
  1. 3 3
      js/SUnit.deploy.js
  2. 5 5
      js/SUnit.js
  3. 2 2
      st/SUnit.st

+ 3 - 3
js/SUnit.deploy.js

@@ -57,12 +57,12 @@ smalltalk.addMethod(
 "_assert_equals_",
 smalltalk.method({
 selector: "assert:equals:",
-fn: function (expected,actual){
+fn: function (actual,expected){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
var $1;
-$1=_st(self)._assert_description_(_st(expected).__eq(actual),_st(_st(_st("Expected: ").__comma(_st(expected)._asString())).__comma(" but was: ")).__comma(_st(actual)._asString()));
+$1=_st(self)._assert_description_(_st(actual).__eq(expected),_st(_st(_st("Expected: ").__comma(_st(expected)._asString())).__comma(" but was: ")).__comma(_st(actual)._asString()));
 return $1;
-}, function($ctx1) {$ctx1.fill(self,"assert:equals:",{expected:expected,actual:actual}, smalltalk.TestCase)})}
+}, function($ctx1) {$ctx1.fill(self,"assert:equals:",{actual:actual,expected:expected}, smalltalk.TestCase)})}
 }),
 smalltalk.TestCase);
 

+ 5 - 5
js/SUnit.js

@@ -79,14 +79,14 @@ smalltalk.addMethod(
 smalltalk.method({
 selector: "assert:equals:",
 category: 'testing',
-fn: function (expected,actual){
+fn: function (actual,expected){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
var $1;
-$1=_st(self)._assert_description_(_st(expected).__eq(actual),_st(_st(_st("Expected: ").__comma(_st(expected)._asString())).__comma(" but was: ")).__comma(_st(actual)._asString()));
+$1=_st(self)._assert_description_(_st(actual).__eq(expected),_st(_st(_st("Expected: ").__comma(_st(expected)._asString())).__comma(" but was: ")).__comma(_st(actual)._asString()));
 return $1;
-}, function($ctx1) {$ctx1.fill(self,"assert:equals:",{expected:expected,actual:actual}, smalltalk.TestCase)})},
-args: ["expected", "actual"],
-source: "assert: expected equals: actual\x0a\x09^ self assert: (expected = actual) description: 'Expected: ', expected asString, ' but was: ', actual asString",
+}, function($ctx1) {$ctx1.fill(self,"assert:equals:",{actual:actual,expected:expected}, smalltalk.TestCase)})},
+args: ["actual", "expected"],
+source: "assert: actual equals: expected\x0a\x09^ self assert: (actual = expected) description: 'Expected: ', expected asString, ' but was: ', actual asString",
 messageSends: ["assert:description:", "=", ",", "asString"],
 referencedClasses: []
 }),

+ 2 - 2
st/SUnit.st

@@ -112,8 +112,8 @@ assert: aBoolean description: aString
 	aBoolean ifFalse: [self signalFailure: aString]
 !
 
-assert: expected equals: actual
-	^ self assert: (expected = actual) description: 'Expected: ', expected asString, ' but was: ', actual asString
+assert: actual equals: expected
+	^ self assert: (actual = expected) description: 'Expected: ', expected asString, ' but was: ', actual asString
 !
 
 deny: aBoolean