|
@@ -257,6 +257,26 @@ referencedClasses: []
|
|
}),
|
|
}),
|
|
smalltalk.SUnitAsyncTest);
|
|
smalltalk.SUnitAsyncTest);
|
|
|
|
|
|
|
|
+smalltalk.addMethod(
|
|
|
|
+"_selectorSetOf_",
|
|
|
|
+smalltalk.method({
|
|
|
|
+selector: "selectorSetOf:",
|
|
|
|
+category: 'private',
|
|
|
|
+fn: function (aCollection){
|
|
|
|
+var self=this;
|
|
|
|
+return smalltalk.withContext(function($ctx1) {
var $1;
|
|
|
|
+$1=_st(_st(aCollection)._collect_((function(each){
|
|
|
|
+return smalltalk.withContext(function($ctx2) {
return _st(each)._selector();
|
|
|
|
+}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})})))._asSet();
|
|
|
|
+return $1;
|
|
|
|
+}, function($ctx1) {$ctx1.fill(self,"selectorSetOf:",{aCollection:aCollection}, smalltalk.SUnitAsyncTest)})},
|
|
|
|
+args: ["aCollection"],
|
|
|
|
+source: "selectorSetOf: aCollection\x0a\x09^(aCollection collect: [:each | each selector]) asSet",
|
|
|
|
+messageSends: ["asSet", "collect:", "selector"],
|
|
|
|
+referencedClasses: []
|
|
|
|
+}),
|
|
|
|
+smalltalk.SUnitAsyncTest);
|
|
|
|
+
|
|
smalltalk.addMethod(
|
|
smalltalk.addMethod(
|
|
"_setUp",
|
|
"_setUp",
|
|
smalltalk.method({
|
|
smalltalk.method({
|
|
@@ -273,26 +293,6 @@ referencedClasses: []
|
|
}),
|
|
}),
|
|
smalltalk.SUnitAsyncTest);
|
|
smalltalk.SUnitAsyncTest);
|
|
|
|
|
|
-smalltalk.addMethod(
|
|
|
|
-"_sortedSelectors_",
|
|
|
|
-smalltalk.method({
|
|
|
|
-selector: "sortedSelectors:",
|
|
|
|
-category: 'private',
|
|
|
|
-fn: function (aCollection){
|
|
|
|
-var self=this;
|
|
|
|
-return smalltalk.withContext(function($ctx1) {
var $1;
|
|
|
|
-$1=_st(_st(aCollection)._collect_((function(each){
|
|
|
|
-return smalltalk.withContext(function($ctx2) {
return _st(each)._selector();
|
|
|
|
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})})))._sorted();
|
|
|
|
-return $1;
|
|
|
|
-}, function($ctx1) {$ctx1.fill(self,"sortedSelectors:",{aCollection:aCollection}, smalltalk.SUnitAsyncTest)})},
|
|
|
|
-args: ["aCollection"],
|
|
|
|
-source: "sortedSelectors: aCollection\x0a\x09^(aCollection collect: [:each | each selector]) sorted",
|
|
|
|
-messageSends: ["sorted", "collect:", "selector"],
|
|
|
|
-referencedClasses: []
|
|
|
|
-}),
|
|
|
|
-smalltalk.SUnitAsyncTest);
|
|
|
|
-
|
|
|
|
smalltalk.addMethod(
|
|
smalltalk.addMethod(
|
|
"_tearDown",
|
|
"_tearDown",
|
|
smalltalk.method({
|
|
smalltalk.method({
|
|
@@ -317,7 +317,7 @@ category: 'tests',
|
|
fn: function (){
|
|
fn: function (){
|
|
var self=this;
|
|
var self=this;
|
|
var suite,runner,result,assertBlock;
|
|
var suite,runner,result,assertBlock;
|
|
-return smalltalk.withContext(function($ctx1) {
var $1,$2,$4,$6,$5,$3;
|
|
|
|
|
|
+return smalltalk.withContext(function($ctx1) {
var $1,$2;
|
|
suite=_st(["fakeError", "fakeErrorFailingInTearDown", "fakeFailure", "testPass"])._collect_((function(each){
|
|
suite=_st(["fakeError", "fakeErrorFailingInTearDown", "fakeFailure", "testPass"])._collect_((function(each){
|
|
return smalltalk.withContext(function($ctx2) {
return _st(_st(self)._class())._selector_(each);
|
|
return smalltalk.withContext(function($ctx2) {
return _st(_st(self)._class())._selector_(each);
|
|
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
|
|
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
|
|
@@ -325,26 +325,22 @@ runner=_st((smalltalk.TestSuiteRunner || TestSuiteRunner))._on_(suite);
|
|
_st(self)._timeout_((200));
|
|
_st(self)._timeout_((200));
|
|
result=_st(runner)._result();
|
|
result=_st(runner)._result();
|
|
assertBlock=_st(self)._async_((function(){
|
|
assertBlock=_st(self)._async_((function(){
|
|
-return smalltalk.withContext(function($ctx2) {
_st(self)._assert_equals_(["fakeError"],_st(self)._sortedSelectors_(_st(result)._errors()));
|
|
|
|
-_st(self)._assert_equals_(["fakeErrorFailingInTearDown", "fakeFailure"],_st(self)._sortedSelectors_(_st(result)._failures()));
|
|
|
|
|
|
+return smalltalk.withContext(function($ctx2) {
_st(self)._assert_equals_(_st(["fakeError"])._asSet(),_st(self)._selectorSetOf_(_st(result)._errors()));
|
|
|
|
+_st(self)._assert_equals_(_st(["fakeErrorFailingInTearDown", "fakeFailure"])._asSet(),_st(self)._selectorSetOf_(_st(result)._failures()));
|
|
return _st(self)._finished();
|
|
return _st(self)._finished();
|
|
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
|
|
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
|
|
-$1=_st(runner)._announcer();
|
|
|
|
-$2=(smalltalk.ResultAnnouncement || ResultAnnouncement);
|
|
|
|
-$3=(function(ann){
|
|
|
|
-return smalltalk.withContext(function($ctx2) {
$4=_st(_st(ann)._result()).__eq_eq(result);
|
|
|
|
-$5=(function(){
|
|
|
|
-return smalltalk.withContext(function($ctx3) {
$6=_st(_st(result)._runs()).__eq(_st(result)._total());
|
|
|
|
-return _st($6)._ifTrue_(assertBlock);
|
|
|
|
-}, function($ctx3) {$ctx3.fillBlock({},$ctx1)})});
|
|
|
|
-return _st($4)._ifTrue_($5);
|
|
|
|
-}, function($ctx2) {$ctx2.fillBlock({ann:ann},$ctx1)})});
|
|
|
|
-_st($1)._on_do_($2,$3);
|
|
|
|
|
|
+_st(_st(runner)._announcer())._on_do_((smalltalk.ResultAnnouncement || ResultAnnouncement),(function(ann){
|
|
|
|
+return smalltalk.withContext(function($ctx2) {
$1=_st(_st(ann)._result()).__eq_eq(result);
|
|
|
|
+if(smalltalk.assert($1)){
|
|
|
|
+$2=_st(_st(result)._runs()).__eq(_st(result)._total());
|
|
|
|
+return _st($2)._ifTrue_(assertBlock);
|
|
|
|
+};
|
|
|
|
+}, function($ctx2) {$ctx2.fillBlock({ann:ann},$ctx1)})}));
|
|
_st(runner)._run();
|
|
_st(runner)._run();
|
|
return self}, function($ctx1) {$ctx1.fill(self,"testAsyncErrorsAndFailures",{suite:suite,runner:runner,result:result,assertBlock:assertBlock}, smalltalk.SUnitAsyncTest)})},
|
|
return self}, function($ctx1) {$ctx1.fill(self,"testAsyncErrorsAndFailures",{suite:suite,runner:runner,result:result,assertBlock:assertBlock}, smalltalk.SUnitAsyncTest)})},
|
|
args: [],
|
|
args: [],
|
|
-source: "testAsyncErrorsAndFailures\x0a\x09| suite runner result assertBlock |\x0a\x09suite := #('fakeError' 'fakeErrorFailingInTearDown' 'fakeFailure' 'testPass') collect: [ :each | self class selector: each ].\x0a runner := TestSuiteRunner on: suite.\x0a self timeout: 200.\x0a\x09result := runner result.\x0a assertBlock := self async: [\x0a\x09\x09self assert: #('fakeError') equals: (self sortedSelectors: result errors).\x0a\x09\x09self assert: #('fakeErrorFailingInTearDown' 'fakeFailure') equals: (self sortedSelectors: result failures).\x0a\x09\x09self finished\x0a \x09].\x0a runner announcer on: ResultAnnouncement do: [:ann |\x0a \x09ann result == result ifTrue: [ result runs = result total ifTrue: assertBlock ]].\x0a\x09runner run",
|
|
|
|
-messageSends: ["collect:", "selector:", "class", "on:", "timeout:", "result", "async:", "assert:equals:", "sortedSelectors:", "errors", "failures", "finished", "on:do:", "ifTrue:", "=", "total", "runs", "==", "announcer", "run"],
|
|
|
|
|
|
+source: "testAsyncErrorsAndFailures\x0a\x09| suite runner result assertBlock |\x0a\x09suite := #('fakeError' 'fakeErrorFailingInTearDown' 'fakeFailure' 'testPass') collect: [ :each | self class selector: each ].\x0a runner := TestSuiteRunner on: suite.\x0a self timeout: 200.\x0a\x09result := runner result.\x0a assertBlock := self async: [\x0a\x09\x09self assert: #('fakeError') asSet equals: (self selectorSetOf: result errors).\x0a\x09\x09self assert: #('fakeErrorFailingInTearDown' 'fakeFailure') asSet equals: (self selectorSetOf: result failures).\x0a\x09\x09self finished\x0a \x09].\x0a runner announcer on: ResultAnnouncement do: [:ann |\x0a \x09ann result == result ifTrue: [ result runs = result total ifTrue: assertBlock ]].\x0a\x09runner run",
|
|
|
|
+messageSends: ["collect:", "selector:", "class", "on:", "timeout:", "result", "async:", "assert:equals:", "asSet", "selectorSetOf:", "errors", "failures", "finished", "on:do:", "ifTrue:", "=", "total", "runs", "==", "announcer", "run"],
|
|
referencedClasses: ["TestSuiteRunner", "ResultAnnouncement"]
|
|
referencedClasses: ["TestSuiteRunner", "ResultAnnouncement"]
|
|
}),
|
|
}),
|
|
smalltalk.SUnitAsyncTest);
|
|
smalltalk.SUnitAsyncTest);
|
|
@@ -447,7 +443,7 @@ category: 'tests',
|
|
fn: function (){
|
|
fn: function (){
|
|
var self=this;
|
|
var self=this;
|
|
var suite,runner,result,assertBlock;
|
|
var suite,runner,result,assertBlock;
|
|
-return smalltalk.withContext(function($ctx1) {
var $1,$2,$4,$6,$5,$3;
|
|
|
|
|
|
+return smalltalk.withContext(function($ctx1) {
var $1,$2;
|
|
suite=_st(["fakeTimeout", "fakeMultipleTimeoutFailing", "fakeMultipleTimeoutPassing", "testPass"])._collect_((function(each){
|
|
suite=_st(["fakeTimeout", "fakeMultipleTimeoutFailing", "fakeMultipleTimeoutPassing", "testPass"])._collect_((function(each){
|
|
return smalltalk.withContext(function($ctx2) {
return _st(_st(self)._class())._selector_(each);
|
|
return smalltalk.withContext(function($ctx2) {
return _st(_st(self)._class())._selector_(each);
|
|
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
|
|
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
|
|
@@ -455,27 +451,23 @@ runner=_st((smalltalk.TestSuiteRunner || TestSuiteRunner))._on_(suite);
|
|
_st(self)._timeout_((200));
|
|
_st(self)._timeout_((200));
|
|
result=_st(runner)._result();
|
|
result=_st(runner)._result();
|
|
assertBlock=_st(self)._async_((function(){
|
|
assertBlock=_st(self)._async_((function(){
|
|
-return smalltalk.withContext(function($ctx2) {
_st(self)._assert_(_st(_st(result)._errors())._isEmpty());
|
|
|
|
-_st(self)._assert_equals_(["fakeMultipleTimeoutFailing", "fakeTimeout"],_st(self)._sortedSelectors_(_st(result)._failures()));
|
|
|
|
|
|
+return smalltalk.withContext(function($ctx2) {
_st(self)._assert_equals_(_st((smalltalk.Set || Set))._new(),_st(self)._selectorSetOf_(_st(result)._errors()));
|
|
|
|
+_st(self)._assert_equals_(_st(["fakeMultipleTimeoutFailing", "fakeTimeout"])._asSet(),_st(self)._selectorSetOf_(_st(result)._failures()));
|
|
return _st(self)._finished();
|
|
return _st(self)._finished();
|
|
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
|
|
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
|
|
-$1=_st(runner)._announcer();
|
|
|
|
-$2=(smalltalk.ResultAnnouncement || ResultAnnouncement);
|
|
|
|
-$3=(function(ann){
|
|
|
|
-return smalltalk.withContext(function($ctx2) {
$4=_st(_st(ann)._result()).__eq_eq(result);
|
|
|
|
-$5=(function(){
|
|
|
|
-return smalltalk.withContext(function($ctx3) {
$6=_st(_st(result)._runs()).__eq(_st(result)._total());
|
|
|
|
-return _st($6)._ifTrue_(assertBlock);
|
|
|
|
-}, function($ctx3) {$ctx3.fillBlock({},$ctx1)})});
|
|
|
|
-return _st($4)._ifTrue_($5);
|
|
|
|
-}, function($ctx2) {$ctx2.fillBlock({ann:ann},$ctx1)})});
|
|
|
|
-_st($1)._on_do_($2,$3);
|
|
|
|
|
|
+_st(_st(runner)._announcer())._on_do_((smalltalk.ResultAnnouncement || ResultAnnouncement),(function(ann){
|
|
|
|
+return smalltalk.withContext(function($ctx2) {
$1=_st(_st(ann)._result()).__eq_eq(result);
|
|
|
|
+if(smalltalk.assert($1)){
|
|
|
|
+$2=_st(_st(result)._runs()).__eq(_st(result)._total());
|
|
|
|
+return _st($2)._ifTrue_(assertBlock);
|
|
|
|
+};
|
|
|
|
+}, function($ctx2) {$ctx2.fillBlock({ann:ann},$ctx1)})}));
|
|
_st(runner)._run();
|
|
_st(runner)._run();
|
|
return self}, function($ctx1) {$ctx1.fill(self,"testTimeouts",{suite:suite,runner:runner,result:result,assertBlock:assertBlock}, smalltalk.SUnitAsyncTest)})},
|
|
return self}, function($ctx1) {$ctx1.fill(self,"testTimeouts",{suite:suite,runner:runner,result:result,assertBlock:assertBlock}, smalltalk.SUnitAsyncTest)})},
|
|
args: [],
|
|
args: [],
|
|
-source: "testTimeouts\x0a\x09| suite runner result assertBlock |\x0a\x09suite := #('fakeTimeout' 'fakeMultipleTimeoutFailing' 'fakeMultipleTimeoutPassing' 'testPass') collect: [ :each | self class selector: each ].\x0a runner := TestSuiteRunner on: suite.\x0a self timeout: 200.\x0a\x09result := runner result.\x0a assertBlock := self async: [\x0a\x09\x09self assert: result errors isEmpty.\x0a\x09\x09self assert: #('fakeMultipleTimeoutFailing' 'fakeTimeout') equals: (self sortedSelectors: result failures).\x0a\x09\x09self finished\x0a \x09].\x0a runner announcer on: ResultAnnouncement do: [:ann |\x0a \x09ann result == result ifTrue: [ result runs = result total ifTrue: assertBlock ]].\x0a\x09runner run",
|
|
|
|
-messageSends: ["collect:", "selector:", "class", "on:", "timeout:", "result", "async:", "assert:", "isEmpty", "errors", "assert:equals:", "sortedSelectors:", "failures", "finished", "on:do:", "ifTrue:", "=", "total", "runs", "==", "announcer", "run"],
|
|
|
|
-referencedClasses: ["TestSuiteRunner", "ResultAnnouncement"]
|
|
|
|
|
|
+source: "testTimeouts\x0a\x09| suite runner result assertBlock |\x0a\x09suite := #('fakeTimeout' 'fakeMultipleTimeoutFailing' 'fakeMultipleTimeoutPassing' 'testPass') collect: [ :each | self class selector: each ].\x0a runner := TestSuiteRunner on: suite.\x0a self timeout: 200.\x0a\x09result := runner result.\x0a assertBlock := self async: [\x0a\x09\x09self assert: Set new equals: (self selectorSetOf: result errors).\x0a\x09\x09self assert: #('fakeMultipleTimeoutFailing' 'fakeTimeout') asSet equals: (self selectorSetOf: result failures).\x0a\x09\x09self finished\x0a \x09].\x0a runner announcer on: ResultAnnouncement do: [:ann |\x0a \x09ann result == result ifTrue: [ result runs = result total ifTrue: assertBlock ]].\x0a\x09runner run",
|
|
|
|
+messageSends: ["collect:", "selector:", "class", "on:", "timeout:", "result", "async:", "assert:equals:", "new", "selectorSetOf:", "errors", "asSet", "failures", "finished", "on:do:", "ifTrue:", "=", "total", "runs", "==", "announcer", "run"],
|
|
|
|
+referencedClasses: ["TestSuiteRunner", "Set", "ResultAnnouncement"]
|
|
}),
|
|
}),
|
|
smalltalk.SUnitAsyncTest);
|
|
smalltalk.SUnitAsyncTest);
|
|
|
|
|