Merge pull request amber-smalltalk#227 from herby/test-run-selected-only

Only run tests from selected categories. Fixes #226.
froucoux · Jun 14, 2012 · 5c9c9d8 · 5c9c9d8
2 parents 4a95f86 + 2337b56
commit 5c9c9d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/js/IDE.deploy.js b/js/IDE.deploy.js
@@ -3238,11 +3238,11 @@ smalltalk.addMethod(
 "_testCases",
 smalltalk.method({
 selector: "testCases",
-fn: function () {
+fn: function (){
 var self=this;
 var testCases=nil;
 (testCases=[]);
-smalltalk.send(smalltalk.send(self, "_selectedClasses", []), "_do_", [(function(each){return smalltalk.send(testCases, "_addAll_", [smalltalk.send(each, "_buildSuite", [])]);})]);
+smalltalk.send(smalltalk.send(smalltalk.send(self, "_selectedClasses", []), "_select_", [(function(each){return smalltalk.send(smalltalk.send(self, "_selectedCategories", []), "_includes_", [smalltalk.send(each, "_category", [])]);})]), "_do_", [(function(each){return smalltalk.send(testCases, "_addAll_", [smalltalk.send(each, "_buildSuite", [])]);})]);
 return testCases;
 return self;}
 }),

diff --git a/js/IDE.js b/js/IDE.js
@@ -4564,16 +4564,16 @@ smalltalk.addMethod(
 smalltalk.method({
 selector: "testCases",
 category: 'accessing',
-fn: function () {
+fn: function (){
 var self=this;
 var testCases=nil;
 (testCases=[]);
-smalltalk.send(smalltalk.send(self, "_selectedClasses", []), "_do_", [(function(each){return smalltalk.send(testCases, "_addAll_", [smalltalk.send(each, "_buildSuite", [])]);})]);
+smalltalk.send(smalltalk.send(smalltalk.send(self, "_selectedClasses", []), "_select_", [(function(each){return smalltalk.send(smalltalk.send(self, "_selectedCategories", []), "_includes_", [smalltalk.send(each, "_category", [])]);})]), "_do_", [(function(each){return smalltalk.send(testCases, "_addAll_", [smalltalk.send(each, "_buildSuite", [])]);})]);
 return testCases;
 return self;},
 args: [],
-source: "testCases\x0a\x09| testCases |\x0a\x09testCases := #().\x0a\x09self selectedClasses do: [:each | testCases addAll: each buildSuite].\x0a\x09^testCases",
-messageSends: ["do:", "selectedClasses", "addAll:", "buildSuite"],
+source: "testCases\x0a\x09| testCases |\x0a\x09testCases := #().\x0a\x09(self selectedClasses\x0a\x09\x09select: [:each | self selectedCategories includes: each category])\x0a\x09\x09do: [:each | testCases addAll: each buildSuite].\x0a\x09^testCases",
+messageSends: ["do:", "select:", "selectedClasses", "includes:", "selectedCategories", "category", "addAll:", "buildSuite"],
 referencedClasses: []
 }),
 smalltalk.TestRunner);

diff --git a/st/IDE.st b/st/IDE.st
@@ -2033,7 +2033,9 @@ statusInfo
 testCases
 	| testCases |
 	testCases := #().
-	self selectedClasses do: [:each | testCases addAll: each buildSuite].
+	(self selectedClasses
+		select: [:each | self selectedCategories includes: each category])
+		do: [:each | testCases addAll: each buildSuite].
 	^testCases
 ! !