Fix unimplemented methods and small refactoring for test filters

README.md

@@ -16,7 +16,7 @@ This project was originally developed at the University of Buenos Aires (Argenti
 ```smalltalk
 Metacello new
   baseline: 'MuTalk';
-  repository: 'github://pharo-contributions/mutalk:v2.1.0/src';
+  repository: 'github://pharo-contributions/mutalk:v2.2.1/src';
   load.
 ```
 * Full version:

src/MuTalk-Model/MTBlockTestFilter.class.st

@@ -1,25 +1,47 @@
 Class {
 	#name : 'MTBlockTestFilter',
 	#superclass : 'MTTestFilter',
+	#instVars : [
+		'conditionBlock'
+	],
 	#category : 'MuTalk-Model-Test filters',
 	#package : 'MuTalk-Model',
 	#tag : 'Test filters'
 }
 
+{ #category : 'accessing' }
+MTBlockTestFilter >> condition: aConditionBlock [
+
+	self conditionBlock: aConditionBlock
+]
+
+{ #category : 'accessing' }
+MTBlockTestFilter >> conditionBlock [
+
+	^ conditionBlock
+]
+
+{ #category : 'accessing' }
+MTBlockTestFilter >> conditionBlock: anObject [
+
+	conditionBlock := anObject
+]
+
 { #category : 'enumerating' }
 MTBlockTestFilter >> excludedTestsFrom: aTestCaseCollection [
 
-	^ aTestCaseCollection reject: condition
+	^ aTestCaseCollection reject: conditionBlock
 ]
 
 { #category : 'accessing' }
-MTBlockTestFilter >> filteredTestReason [ 
+MTBlockTestFilter >> filteredTestReason [
 
-	^ 'Took longer than ', condition printString, ' to run'
+	^ 'Did not respect the block condition: '
+	  , conditionBlock printString
 ]
 
 { #category : 'enumerating' }
 MTBlockTestFilter >> filteredTestsFrom: aTestCaseCollection [
 
-	^ aTestCaseCollection select: condition
+	^ aTestCaseCollection select: conditionBlock
 ]

src/MuTalk-Model/MTPragmaRejectionTestFilter.class.st

@@ -21,5 +21,5 @@ MTPragmaRejectionTestFilter >> filteredTestsFrom: aTestCaseCollection [
 { #category : 'accessing' }
 MTPragmaRejectionTestFilter >> reasonString [
 
-	^ 'Contains the pragma <' , condition
+	^ 'Contains the pragma'
 ]

src/MuTalk-Model/MTPragmaSelectionTestFilter.class.st

@@ -21,5 +21,5 @@ MTPragmaSelectionTestFilter >> filteredTestsFrom: aTestCaseCollection [
 { #category : 'accessing' }
 MTPragmaSelectionTestFilter >> reasonString [
 
-	^ 'Does not contain the pragma <' , condition
+	^ 'Does not contain the pragma'
 ]

src/MuTalk-Model/MTPragmaTestFilter.class.st

@@ -2,7 +2,8 @@ Class {
 	#name : 'MTPragmaTestFilter',
 	#superclass : 'MTTestFilter',
 	#instVars : [
-		'pragmaArguments'
+		'pragmaArguments',
+		'pragmaSelector'
 	],
 	#category : 'MuTalk-Model-Test filters',
 	#package : 'MuTalk-Model',
@@ -30,11 +31,17 @@ MTPragmaTestFilter class >> isAbstract [
 	^ self == MTPragmaTestFilter
 ]
 
+{ #category : 'accessing' }
+MTPragmaTestFilter >> condition: aPragmaSelector [
+
+	self pragmaSelector: aPragmaSelector
+]
+
 { #category : 'accessing' }
 MTPragmaTestFilter >> filteredTestReason [
 
 	| reasonString |
-	reasonString := self reasonString.
+	reasonString := self reasonString , ' <' , pragmaSelector.
 
 	^ pragmaArguments isEmpty
 		  ifTrue: [ reasonString , '>' ]
@@ -52,7 +59,7 @@ MTPragmaTestFilter >> isPragmaValidFrom: aTestCaseReference [
 	| pragmas |
 	pragmas := aTestCaseReference method pragmas.
 	^ pragmas anySatisfy: [ :pragma |
-		  pragma selector = condition & (pragma arguments = pragmaArguments) ]
+		  pragma selector = pragmaSelector & (pragma arguments = pragmaArguments) ]
 ]
 
 { #category : 'accessing' }
@@ -67,6 +74,18 @@ MTPragmaTestFilter >> pragmaArguments: anObject [
 	pragmaArguments := anObject
 ]
 
+{ #category : 'accessing' }
+MTPragmaTestFilter >> pragmaSelector [
+
+	^ pragmaSelector
+]
+
+{ #category : 'accessing' }
+MTPragmaTestFilter >> pragmaSelector: anObject [
+
+	pragmaSelector := anObject
+]
+
 { #category : 'accessing' }
 MTPragmaTestFilter >> reasonString [
 

src/MuTalk-Model/MTRedTestFilter.class.st

@@ -7,7 +7,20 @@ Class {
 }
 
 { #category : 'enumerating' }
-MTRedTestFilter >> filterTests: aTestCaseCollection [
+MTRedTestFilter >> excludedTestsFrom: aTestCaseCollection [
+
+	^ aTestCaseCollection select: [ :testCase |
+		  self failuresOrErrorsIn: testCase lastResult ]
+]
+
+{ #category : 'accessing' }
+MTRedTestFilter >> filteredTestReason [
+
+	^ 'Was initially failing, even without any mutant applied'
+]
+
+{ #category : 'enumerating' }
+MTRedTestFilter >> filteredTestsFrom: aTestCaseCollection [
 
 	^ aTestCaseCollection reject: [ :testCase |
 		  self failuresOrErrorsIn: testCase lastResult ]

src/MuTalk-Model/MTTestFilter.class.st

@@ -2,7 +2,6 @@ Class {
 	#name : 'MTTestFilter',
 	#superclass : 'Object',
 	#instVars : [
-		'condition',
 		'excludedTests',
 		'filteredTests'
 	],
@@ -19,18 +18,6 @@ MTTestFilter class >> for: aCondition [
 		  yourself
 ]
 
-{ #category : 'accessing' }
-MTTestFilter >> condition [
-
-	^ condition
-]
-
-{ #category : 'accessing' }
-MTTestFilter >> condition: aCondition [
-
-	condition := aCondition
-]
-
 { #category : 'accessing' }
 MTTestFilter >> excludedTests [
 

src/MuTalk-Model/MTTimeTestFilter.class.st

@@ -1,27 +1,48 @@
 Class {
 	#name : 'MTTimeTestFilter',
 	#superclass : 'MTTestFilter',
+	#instVars : [
+		'maxDuration'
+	],
 	#category : 'MuTalk-Model-Test filters',
 	#package : 'MuTalk-Model',
 	#tag : 'Test filters'
 }
 
+{ #category : 'accessing' }
+MTTimeTestFilter >> condition: aMaxDuration [
+
+	self maxDuration: aMaxDuration
+]
+
 { #category : 'enumerating' }
 MTTimeTestFilter >> excludedTestsFrom: aTestCaseCollection [
 
 	^ aTestCaseCollection reject: [ :testCaseReference |
-		  testCaseReference lastTimeToRun <= condition ]
+		  testCaseReference lastTimeToRun <= maxDuration ]
 ]
 
 { #category : 'accessing' }
 MTTimeTestFilter >> filteredTestReason [ 
 
-	^ 'Took longer than ', condition printString, ' to run'
+	^ 'Took longer than ', maxDuration printString, ' to run'
 ]
 
 { #category : 'enumerating' }
 MTTimeTestFilter >> filteredTestsFrom: aTestCaseCollection [
 
 	^ aTestCaseCollection select: [ :testCaseReference |
-		  testCaseReference lastTimeToRun <= condition ]
+		  testCaseReference lastTimeToRun <= maxDuration ]
+]
+
+{ #category : 'accessing' }
+MTTimeTestFilter >> maxDuration [
+
+	^ maxDuration
+]
+
+{ #category : 'accessing' }
+MTTimeTestFilter >> maxDuration: anObject [
+
+	maxDuration := anObject
 ]