Merge branch 'master' into fix/defaultBudget

src/MuTalk-Model/MTAnalysis.class.st

@@ -156,12 +156,13 @@ MTAnalysis >> generateResults [
 MTAnalysis >> initialTestRun [
 	"Runs all tests once and filters them"
 
-	| results |
-	results := testCases collect: [ :aTestCase | aTestCase run ].
-
+	testCases do: [ :aTestCase | aTestCase run ].
+
 	"The test filter is initialized lazily here because the default one needs the run time of tests, so the initial test run must be executed first"
-	self testFilter validateFailuresIn: results.
-	testCases := testFilter filterTests: testCases
+	testCases := self testFilter filterTests: testCases.
+	(testCases anySatisfy: [ :testCase |
+		 self testFilter failuresOrErrorsIn: testCase ]) ifTrue: [
+		MTTestsWithErrorsException signal ]
 ]
 
 { #category : 'initialization' }
@@ -275,20 +276,16 @@ MTAnalysis >> run [
 	those classes) and execute all mutants in the set of testClases.
 	We obtain a result for each mutant generated"
 
-	^ [
-	  self initialTestRun.
-	  budget start.
-	  logger logAnalysisStartFor: self.
-	  elapsedTime := [
-	                 self generateCoverageAnalysis.
-	                 self generateMutations.
-	                 self generateResults ] timeToRun.
-	  true ]
-		  on: MTTestsWithErrorsException
-		  do: [ :ex |
-			  self inform:
-				  'Your tests have Errors or Failures. Please correct them.'.
-			  false ]
+	self initialTestRun.
+
+	"The budget is started after the initial test run because the default one needs the run time of tests"
+	budget start.
+	logger logAnalysisStartFor: self.
+
+	elapsedTime := [
+		self generateCoverageAnalysis.
+		self generateMutations.
+		self generateResults ] timeToRun
 ]
 
 { #category : 'accessing' }

src/MuTalk-Model/MTRedTestFilter.class.st

@@ -10,7 +10,7 @@ Class {
 MTRedTestFilter >> excludedTestsFrom: aTestCaseCollection [
 
 	^ aTestCaseCollection select: [ :testCase |
-		  self failuresOrErrorsIn: testCase lastResult ]
+		  self failuresOrErrorsIn: testCase ]
 ]
 
 { #category : 'accessing' }
@@ -23,12 +23,5 @@ MTRedTestFilter >> filteredTestReason [
 MTRedTestFilter >> filteredTestsFrom: aTestCaseCollection [
 
 	^ aTestCaseCollection reject: [ :testCase |
-		  self failuresOrErrorsIn: testCase lastResult ]
-]
-
-{ #category : 'testing' }
-MTRedTestFilter >> unwantedFailuresOrErrorsIn: results [
-	"It is not a problem if there are unwanted failures or errors because they will be filtered out anyway"
-
-	^ false
+		  self failuresOrErrorsIn: testCase ]
 ]

src/MuTalk-Model/MTTestFilter.class.st

@@ -37,9 +37,9 @@ MTTestFilter >> excludedTestsFrom: aTestCaseCollection [
 ]
 
 { #category : 'testing' }
-MTTestFilter >> failuresOrErrorsIn: result [
+MTTestFilter >> failuresOrErrorsIn: testCase [
 
-	^ result failures isNotEmpty or: [ result unexpectedErrorCount > 0 ]
+	^ testCase lastResult failures isNotEmpty or: [ testCase lastResult unexpectedErrorCount > 0 ]
 ]
 
 { #category : 'enumerating' }
@@ -73,17 +73,3 @@ MTTestFilter >> filteredTestsFrom: aTestCaseCollection [
 
 	^ self subclassResponsibility
 ]
-
-{ #category : 'testing' }
-MTTestFilter >> unwantedFailuresOrErrorsIn: results [
-	"Checks if the results contain failures or errors while they shouldn't"
-
-	^ results anySatisfy: [ :result | self failuresOrErrorsIn: result ]
-]
-
-{ #category : 'checking' }
-MTTestFilter >> validateFailuresIn: results [
-
-	(self unwantedFailuresOrErrorsIn: results) ifTrue: [
-		MTTestsWithErrorsException signal ]
-]