adapt analysis to new structure of test filters & rename everything "…

…filtered tests" to "excluded tests" to match test filters instance variables
pharo-contributions · Mar 14, 2024 · 8e493f1 · 8e493f1
1 parent b0af3ad
commit 8e493f1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 49 deletions.
diff --git a/src/MuTalk-Model/MTAnalysis.class.st b/src/MuTalk-Model/MTAnalysis.class.st
@@ -14,8 +14,7 @@ Class {
 		'stopOnErrorOrFail',
 		'testSelectionStrategy',
 		'mutantSelectionStrategy',
-		'testFilter',
-		'filteredTests'
+		'testFilter'
 	],
 	#category : 'MuTalk-Model-Core',
 	#package : 'MuTalk-Model',
@@ -506,36 +505,13 @@ MTAnalysis >> doNotStopOnErrorOrFail [
 	stopOnErrorOrFail := false
 ]
 
-{ #category : 'accessing' }
-MTAnalysis >> filteredTests [
-
-	^ filteredTests
-]
-
-{ #category : 'accessing' }
-MTAnalysis >> filteredTests: anObject [
-
-	filteredTests := anObject
-]
-
-{ #category : 'as yet unclassified' }
-MTAnalysis >> filteredTestsFrom: aTestCollection [
-
-	filteredTests := aTestCollection
-		                 inject: OrderedCollection new
-		                 into: [ :accumulator :test |
-			                 accumulator add:
-				                 test -> testFilter filteredTestReason.
-			                 accumulator ]
-]
-
 { #category : 'results' }
 MTAnalysis >> generalResult [
 
 	^ MTGeneralResult
 		  for: mutantResults
 		  timed: elapsedTime
-		  filteredTests: filteredTests
+		  excludedTests: testFilter excludedTests
 ]
 
 { #category : 'running' }
@@ -560,18 +536,17 @@ MTAnalysis >> generateMutations [
 { #category : 'running' }
 MTAnalysis >> generateResults [
 
-	| tests |
+	| filteredTests |
 	mutantResults := OrderedCollection new.
-	tests := testFilter filterTests: testCases.
-	self filteredTestsFrom: (testCases copyWithoutAll: tests).
+	filteredTests := testFilter filterTests: testCases.
 
 	mutations do: [ :aMutation |
 		(budget exceedsBudgetOn: mutantResults fromTotalMutations: mutations)
 			ifTrue: [ ^ mutantResults ].
 		logger logStartEvaluating: aMutation.
 		mutantResults add: ((MTMutantEvaluation
 				  for: aMutation
-				  using: tests
+				  using: filteredTests
 				  following: testSelectionStrategy
 				  andConsidering: self coverageAnalysisResult)
 				 valueStoppingOnError: stopOnErrorOrFail) ].

diff --git a/src/MuTalk-Model/MTGeneralResult.class.st b/src/MuTalk-Model/MTGeneralResult.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'particularResults',
 		'elapsedTime',
-		'filteredTests'
+		'excludedTests'
 	],
 	#category : 'MuTalk-Model-Core',
 	#package : 'MuTalk-Model',
@@ -22,7 +22,7 @@ MTGeneralResult class >> for: mutantsEvaluationsResults [
 	^ self
 		  for: mutantsEvaluationsResults
 		  timed: Duration new
-		  filteredTests: #(  )
+		  excludedTests: #(  )
 ]
 
 { #category : 'instance creation' }
@@ -31,16 +31,16 @@ MTGeneralResult class >> for: mutantsEvaluationsResults timed: anElapsedTime [
 	^ self
 		  for: mutantsEvaluationsResults
 		  timed: anElapsedTime
-		  filteredTests: #(  )
+		  excludedTests: #(  )
 ]
 
 { #category : 'instance creation' }
-MTGeneralResult class >> for: mutantsEvaluationsResults timed: anElapsedTime filteredTests: someTests [
+MTGeneralResult class >> for: mutantsEvaluationsResults timed: anElapsedTime excludedTests: someTests [
 
 	^ self new
 		  initializeFor: mutantsEvaluationsResults
 		  timed: anElapsedTime
-		  filteredTests: someTests;
+		  excludedTests: someTests;
 		  yourself
 ]
 
@@ -55,23 +55,23 @@ MTGeneralResult >> elapsedTime [
 ]
 
 { #category : 'accessing' }
-MTGeneralResult >> filteredTests [
+MTGeneralResult >> excludedTests [
 
-	^ filteredTests
+	^ excludedTests
 ]
 
 { #category : 'accessing' }
-MTGeneralResult >> filteredTests: anObject [
+MTGeneralResult >> excludedTests: anObject [
 
-	filteredTests := anObject
+	excludedTests := anObject
 ]
 
 { #category : 'initialize' }
-MTGeneralResult >> initializeFor: mutantsEvaluationsResults timed: anElapsedTime filteredTests: someTests [
+MTGeneralResult >> initializeFor: mutantsEvaluationsResults timed: anElapsedTime excludedTests: someTests [
 
 	particularResults := mutantsEvaluationsResults.
 	elapsedTime := anElapsedTime.
-	filteredTests := someTests
+	excludedTests := someTests
 ]
 
 { #category : 'testing' }

diff --git a/...-SpecUI/MTFilteredTestsPresenter.class.st → ...-SpecUI/MTExcludedTestsPresenter.class.st b/...-SpecUI/MTFilteredTestsPresenter.class.st → ...-SpecUI/MTExcludedTestsPresenter.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : 'MTFilteredTestsPresenter',
+	#name : 'MTExcludedTestsPresenter',
 	#superclass : 'MTMutationResultsPresenter',
 	#instVars : [
 		'testCodePresenter'
@@ -9,7 +9,7 @@ Class {
 }
 
 { #category : 'initialization' }
-MTFilteredTestsPresenter >> connectPresenters [
+MTExcludedTestsPresenter >> connectPresenters [
 
 	tablePresenter whenSelectionChangedDo: [ :selection |
 		| selectedItem |
@@ -21,7 +21,7 @@ MTFilteredTestsPresenter >> connectPresenters [
 ]
 
 { #category : 'layout' }
-MTFilteredTestsPresenter >> defaultLayout [
+MTExcludedTestsPresenter >> defaultLayout [
 
 	^ SpPanedLayout newTopToBottom
 		  add: tablePresenter;
@@ -30,14 +30,14 @@ MTFilteredTestsPresenter >> defaultLayout [
 ]
 
 { #category : 'initialization' }
-MTFilteredTestsPresenter >> initializePresenters [
+MTExcludedTestsPresenter >> initializePresenters [
 
 	tablePresenter := self newTable.
 	tablePresenter
 		items: model;
 		activateOnSingleClick;
 		addColumn: (SpStringTableColumn
-				 title: 'FilteredTests'
+				 title: 'ExcludedTests'
 				 evaluated: [ :each | each key ]);
 		addColumn:
 			(SpStringTableColumn

diff --git a/src/MuTalk-SpecUI/MTGeneralResult.extension.st b/src/MuTalk-SpecUI/MTGeneralResult.extension.st
@@ -1,10 +1,10 @@
 Extension { #name : 'MTGeneralResult' }
 
 { #category : '*MuTalk-SpecUI' }
-MTGeneralResult >> filteredTestsExtension [
+MTGeneralResult >> excludedTestsExtension [
 
-	<inspectorPresentationOrder: 3 title: 'Filtered Tests'>
-	^ MTFilteredTestsPresenter on: filteredTests
+	<inspectorPresentationOrder: 3 title: 'Excluded Tests'>
+	^ MTExcludedTestsPresenter on: excludedTests
 ]
 
 { #category : '*MuTalk-SpecUI' }