Merge pull request #81 from guillep/termination

Improve detection of terminated mutants
pharo-contributions · Feb 19, 2024 · ad184af · ad184af
2 parents 11f7f26 + 73675ac
commit ad184af
Show file tree

Hide file tree

Showing 22 changed files with 195 additions and 89 deletions.
diff --git a/src/MuTalk-Model/MTAnalysis.class.st b/src/MuTalk-Model/MTAnalysis.class.st
@@ -16,8 +16,9 @@ Class {
 		'mutantSelectionStrategy',
 		'testFilter'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'defaults' }
@@ -655,7 +656,7 @@ MTAnalysis >> run [
 		  do: [ :ex |
 			  self inform:
 				  'Your tests have Errors or Failures. Please correct them.'.
-			  ex return: false ]
+			  false ]
 ]
 
 { #category : 'accessing' }

diff --git a/src/MuTalk-Model/MTCoverageAnalysis.class.st b/src/MuTalk-Model/MTCoverageAnalysis.class.st
@@ -9,8 +9,9 @@ Class {
 		'currentTest',
 		'testRunningElapsedTime'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Coverage',
+	#package : 'MuTalk-Model',
+	#tag : 'Coverage'
 }
 
 { #category : 'instance creation' }

diff --git a/src/MuTalk-Model/MTCoverageAnalysisResult.class.st b/src/MuTalk-Model/MTCoverageAnalysisResult.class.st
@@ -6,8 +6,9 @@ Class {
 		'timeToRunTests',
 		'methodReferences'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Coverage',
+	#package : 'MuTalk-Model',
+	#tag : 'Coverage'
 }
 
 { #category : 'instance creation' }

diff --git a/src/MuTalk-Model/MTCoverageTestSuiteSelector.class.st b/src/MuTalk-Model/MTCoverageTestSuiteSelector.class.st
@@ -1,8 +1,9 @@
 Class {
 	#name : 'MTCoverageTestSuiteSelector',
 	#superclass : 'Object',
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Coverage',
+	#package : 'MuTalk-Model',
+	#tag : 'Coverage'
 }
 
 { #category : 'selecting' }

diff --git a/src/MuTalk-Model/MTGeneralResult.class.st b/src/MuTalk-Model/MTGeneralResult.class.st
@@ -5,8 +5,9 @@ Class {
 		'particularResults',
 		'elapsedTime'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'instance creation' }

diff --git a/src/MuTalk-Model/MTInfiniteRecursionError.class.st b/src/MuTalk-Model/MTInfiniteRecursionError.class.st
diff --git a/src/MuTalk-Model/MTMethodInstaller.class.st b/src/MuTalk-Model/MTMethodInstaller.class.st
@@ -1,8 +1,9 @@
 Class {
 	#name : 'MTMethodInstaller',
 	#superclass : 'Object',
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'installing' }

diff --git a/src/MuTalk-Model/MTMethodInstallerException.class.st b/src/MuTalk-Model/MTMethodInstallerException.class.st
@@ -1,6 +1,7 @@
 Class {
 	#name : 'MTMethodInstallerException',
 	#superclass : 'Error',
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
diff --git a/src/MuTalk-Model/MTMethodMutation.class.st b/src/MuTalk-Model/MTMethodMutation.class.st
@@ -10,8 +10,9 @@ Class {
 		'originalProtocol',
 		'data'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'instance creation' }
@@ -171,14 +172,32 @@ MTMethodMutation >> printOn: aStream [
 ]
 
 { #category : 'running' }
-MTMethodMutation >> runMutantStoppingOnError: aBoolean [
+MTMethodMutation >> runMutantStoppingOnError: aBoolean in: anEvaluation [
 
-	| testResults |
+	| testResults brokenTests |
+	[
 	EpMonitor disableDuring: [
-		[ self install.
-		testResults :=  self runTestsStoppingOnError: aBoolean
-  		] ensure: [ self uninstall ] ].
-	^ testResults
+		testResults := [
+		               self install.
+		               self runTestsStoppingOnError: aBoolean ] ensure: [
+			               self uninstall ] ] ]
+		on: Error
+		do: [ :error |
+			^ MTMutantEvaluationResultTerminated
+				  newFor: self
+				  results: error freeze
+				  producedBy: anEvaluation ].
+
+	brokenTests := testResults errorsSize + testResults failuresSize.
+	brokenTests = 0 ifTrue: [
+		^ MTMutantEvaluationResultSurvived
+			  newFor: self
+			  results: testResults
+			  producedBy: anEvaluation ].
+	^ MTMutantEvaluationResultKilled
+		  newFor: self
+		  results: testResults
+		  producedBy: anEvaluation
 ]
 
 { #category : 'private' }

diff --git a/src/MuTalk-Model/MTMethodWrapperForCoverage.class.st b/src/MuTalk-Model/MTMethodWrapperForCoverage.class.st
@@ -5,8 +5,9 @@ Class {
 		'tests',
 		'coverageAnalysis'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Coverage',
+	#package : 'MuTalk-Model',
+	#tag : 'Coverage'
 }
 
 { #category : 'instance creation' }

diff --git a/src/MuTalk-Model/MTMutantEvaluation.class.st b/src/MuTalk-Model/MTMutantEvaluation.class.st
@@ -7,8 +7,9 @@ Class {
 		'testCases',
 		'coverageAnalysisResult'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'instance creation' }
@@ -76,14 +77,9 @@ MTMutantEvaluation >> testResults [
 { #category : 'evaluation' }
 MTMutantEvaluation >> valueStoppingOnError: aBoolean [
 
-	| testResults |
 	self initializeCoverageResultIfNil.
 
 	mutation testCaseReferences:
 		(strategy testCasesToEvaluate: mutation for: self).
-	testResults := mutation runMutantStoppingOnError: aBoolean.
-	^ MTMutantEvaluationResult
-		  for: mutation
-		  results: testResults
-		  producedBy: self
+	^ mutation runMutantStoppingOnError: aBoolean in: self
 ]
diff --git a/src/MuTalk-Model/MTMutantKillingSuggestionGenerator.class.st b/src/MuTalk-Model/MTMutantKillingSuggestionGenerator.class.st
@@ -1,8 +1,9 @@
 Class {
 	#name : 'MTMutantKillingSuggestionGenerator',
 	#superclass : 'Object',
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Reporting',
+	#package : 'MuTalk-Model',
+	#tag : 'Reporting'
 }
 
 { #category : 'evaluating' }

diff --git a/src/MuTalk-Model/MTMutantOperatorShouldNotBeAppliedException.class.st b/src/MuTalk-Model/MTMutantOperatorShouldNotBeAppliedException.class.st
diff --git a/src/MuTalk-Model/MTTestCaseReference.class.st b/src/MuTalk-Model/MTTestCaseReference.class.st
@@ -6,8 +6,9 @@ Class {
 		'selector',
 		'lastTimeToRun'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'instance creation' }

diff --git a/src/MuTalk-Model/MTTestSuiteWrappedForCoverage.class.st b/src/MuTalk-Model/MTTestSuiteWrappedForCoverage.class.st
@@ -4,8 +4,9 @@ Class {
 	#instVars : [
 		'coverageAnalysis'
 	],
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Coverage',
+	#package : 'MuTalk-Model',
+	#tag : 'Coverage'
 }
 
 { #category : 'instance creation' }

diff --git a/src/MuTalk-Model/MTTestsWithErrorsException.class.st b/src/MuTalk-Model/MTTestsWithErrorsException.class.st
@@ -1,6 +1,7 @@
 Class {
 	#name : 'MTTestsWithErrorsException',
 	#superclass : 'Error',
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
diff --git a/src/MuTalk-Model/ManifestMuTalkModel.class.st b/src/MuTalk-Model/ManifestMuTalkModel.class.st
@@ -4,8 +4,9 @@ I store metadata for this package. These meta data are used by other tools such
 Class {
 	#name : 'ManifestMuTalkModel',
 	#superclass : 'PackageManifest',
-	#category : 'MuTalk-Model',
-	#package : 'MuTalk-Model'
+	#category : 'MuTalk-Model-Core',
+	#package : 'MuTalk-Model',
+	#tag : 'Core'
 }
 
 { #category : 'code-critics' }

diff --git a/src/MuTalk-Tests/MTFailedInstallMethodMutation.class.st b/src/MuTalk-Tests/MTFailedInstallMethodMutation.class.st
@@ -0,0 +1,12 @@
+Class {
+	#name : 'MTFailedInstallMethodMutation',
+	#superclass : 'MTMethodMutation',
+	#category : 'MuTalk-Tests',
+	#package : 'MuTalk-Tests'
+}
+
+{ #category : 'installing' }
+MTFailedInstallMethodMutation >> install [
+
+	self error
+]
diff --git a/src/MuTalk-Tests/MTFailedRunMethodMutation.class.st b/src/MuTalk-Tests/MTFailedRunMethodMutation.class.st
@@ -0,0 +1,12 @@
+Class {
+	#name : 'MTFailedRunMethodMutation',
+	#superclass : 'MTMethodMutation',
+	#category : 'MuTalk-Tests',
+	#package : 'MuTalk-Tests'
+}
+
+{ #category : 'private' }
+MTFailedRunMethodMutation >> runTestsStoppingOnError: aBoolean [
+
+	self error
+]
diff --git a/src/MuTalk-Tests/MTFailedUninstallMethodMutation.class.st b/src/MuTalk-Tests/MTFailedUninstallMethodMutation.class.st
@@ -0,0 +1,12 @@
+Class {
+	#name : 'MTFailedUninstallMethodMutation',
+	#superclass : 'MTMethodMutation',
+	#category : 'MuTalk-Tests',
+	#package : 'MuTalk-Tests'
+}
+
+{ #category : 'installing' }
+MTFailedUninstallMethodMutation >> uninstall [
+
+	self error
+]