Merge pull request #72 from DurieuxPol/feat/testFilter

Implemented test filters

Author: guillep

src/MuTalk-Model/MTAnalysis.class.st

@@ -13,7 +13,8 @@ Class {
 		'mutantResults',
 		'stopOnErrorOrFail',
 		'testSelectionStrategy',
-		'mutantSelectionStrategy'
+		'mutantSelectionStrategy',
+		'testFilter'
 	],
 	#category : 'MuTalk-Model',
 	#package : 'MuTalk-Model'
@@ -485,6 +486,12 @@ MTAnalysis >> defaultOperators [
 	^ MTMutantOperator contents
 ]
 
+{ #category : 'accessing - defaults' }
+MTAnalysis >> defaultTestFilter [
+
+	^ MTFreeTestFilter new
+]
+
 { #category : 'accessing - defaults' }
 MTAnalysis >> defaultTestSelectionStrategy [
 
@@ -525,14 +532,17 @@ MTAnalysis >> generateMutations [
 { #category : 'running' }
 MTAnalysis >> generateResults [
 
+	| tests |
 	mutantResults := OrderedCollection new.
+	tests := testFilter filterTests: testCases.
+
 	mutations do: [ :aMutation |
 		(budget exceedsBudgetOn: mutantResults fromTotalMutations: mutations)
 			ifTrue: [ ^ mutantResults ].
 		logger logStartEvaluating: aMutation.
 		mutantResults add: ((MTMutantEvaluation
 				  for: aMutation
-				  using: testCases
+				  using: tests
 				  following: testSelectionStrategy
 				  andConsidering: self coverageAnalysisResult)
 				 valueStoppingOnError: stopOnErrorOrFail) ].
@@ -558,6 +568,7 @@ MTAnalysis >> initialize [
 	elapsedTime := 0.
 	logger := self defaultLogger.
 	budget := self defaultBudget.
+	testFilter := self defaultTestFilter.
 	stopOnErrorOrFail := true
 ]
 
@@ -695,6 +706,18 @@ MTAnalysis >> testClasses: aClassCollection [
 	testCases := self testCasesFrom: aClassCollection
 ]
 
+{ #category : 'accessing' }
+MTAnalysis >> testFilter [
+
+	^ testFilter
+]
+
+{ #category : 'accessing' }
+MTAnalysis >> testFilter: anObject [
+
+	testFilter := anObject
+]
+
 { #category : 'accessing' }
 MTAnalysis >> testSelectionStrategy [
 

src/MuTalk-Model/MTFreeTestFilter.class.st

@@ -0,0 +1,13 @@
+Class {
+	#name : 'MTFreeTestFilter',
+	#superclass : 'MTTestFilter',
+	#category : 'MuTalk-Model-Test filters',
+	#package : 'MuTalk-Model',
+	#tag : 'Test filters'
+}
+
+{ #category : 'enumerating' }
+MTFreeTestFilter >> filterTests: aTestCaseCollection [
+
+	^ aTestCaseCollection
+]

src/MuTalk-Model/MTGeneralResult.class.st

@@ -105,6 +105,12 @@ MTGeneralResult >> numberOfTerminatedMutants [
 	^ self terminatedMutants size
 ]
 
+{ #category : 'accessing' }
+MTGeneralResult >> particularResults [
+
+	^ particularResults
+]
+
 { #category : 'printing' }
 MTGeneralResult >> printDetailedInfoOn: aStream [ 
 

src/MuTalk-Model/MTTestFilter.class.st

@@ -0,0 +1,36 @@
+Class {
+	#name : 'MTTestFilter',
+	#superclass : 'Object',
+	#instVars : [
+		'condition'
+	],
+	#category : 'MuTalk-Model-Test filters',
+	#package : 'MuTalk-Model',
+	#tag : 'Test filters'
+}
+
+{ #category : 'instance creation' }
+MTTestFilter class >> for: aCondition [
+
+	^ self new
+		  condition: aCondition;
+		  yourself
+]
+
+{ #category : 'accessing' }
+MTTestFilter >> condition [
+
+	^ condition
+]
+
+{ #category : 'accessing' }
+MTTestFilter >> condition: aCondition [
+
+	condition := aCondition
+]
+
+{ #category : 'enumerating' }
+MTTestFilter >> filterTests: aTestCaseCollection [
+
+	^ self subclassResponsibility
+]

src/MuTalk-Model/MTTimeTestFilter.class.st

@@ -0,0 +1,14 @@
+Class {
+	#name : 'MTTimeTestFilter',
+	#superclass : 'MTTestFilter',
+	#category : 'MuTalk-Model-Test filters',
+	#package : 'MuTalk-Model',
+	#tag : 'Test filters'
+}
+
+{ #category : 'enumerating' }
+MTTimeTestFilter >> filterTests: aTestCaseCollection [
+
+	^ aTestCaseCollection select: [ :testCaseReference |
+		  testCaseReference lastTimeToRun <= condition ]
+]

src/MuTalk-TestResources/MTAuxiliarClassForTimeTestFilter.class.st

@@ -0,0 +1,12 @@
+Class {
+	#name : 'MTAuxiliarClassForTimeTestFilter',
+	#superclass : 'Object',
+	#category : 'MuTalk-TestResources',
+	#package : 'MuTalk-TestResources'
+}
+
+{ #category : 'accessing' }
+MTAuxiliarClassForTimeTestFilter >> simpleMethod [
+
+	^ 1 + 1
+]

src/MuTalk-TestResources/MTAuxiliarClassForTimeTestFilterTest.class.st

@@ -0,0 +1,18 @@
+Class {
+	#name : 'MTAuxiliarClassForTimeTestFilterTest',
+	#superclass : 'TestCase',
+	#category : 'MuTalk-TestResources',
+	#package : 'MuTalk-TestResources'
+}
+
+{ #category : 'tests' }
+MTAuxiliarClassForTimeTestFilterTest >> test10Milliseconds [
+
+	10 milliSeconds wait
+]
+
+{ #category : 'tests' }
+MTAuxiliarClassForTimeTestFilterTest >> test1Second [
+
+	1 second wait
+]

src/MuTalk-Tests/MTTestCasesSelectionStrategyTest.class.st

@@ -17,7 +17,8 @@ MTTestCasesSelectionStrategyTest >> allTestsFromPackage [
 		   with: MTAuxiliarClassForMTAnalysisTest
 		   with: MTAuxiliarTestClassForMTBudget
 		   with:
-		   MTAuxiliarTestClassForContinuingTestsExecutionAfterFirstFail)
+		   MTAuxiliarTestClassForContinuingTestsExecutionAfterFirstFail
+		   with: MTAuxiliarClassForTimeTestFilterTest)
 		  inject: OrderedCollection new
 		  into: [ :tests :testClass |
 			  tests addAll: testClass suite tests.

src/MuTalk-Tests/MTTestFilterTest.class.st

@@ -0,0 +1,26 @@
+Class {
+	#name : 'MTTestFilterTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'analysis'
+	],
+	#category : 'MuTalk-Tests',
+	#package : 'MuTalk-Tests'
+}
+
+{ #category : 'testing' }
+MTTestFilterTest class >> isAbstract [
+
+	^ self == MTTestFilterTest
+]
+
+{ #category : 'running' }
+MTTestFilterTest >> runAnalysisWithFilter: aTestFilter on: classesToMutate withTests: testCases [
+
+	analysis := MTAnalysis new
+		            testClasses: testCases;
+		            classesToMutate: classesToMutate;
+		            testFilter: aTestFilter.
+
+	analysis run
+]

src/MuTalk-Tests/MTTimeTestFilterTest.class.st

@@ -0,0 +1,52 @@
+Class {
+	#name : 'MTTimeTestFilterTest',
+	#superclass : 'MTTestFilterTest',
+	#category : 'MuTalk-Tests',
+	#package : 'MuTalk-Tests'
+}
+
+{ #category : 'running' }
+MTTimeTestFilterTest >> runAnalysisForTimeCondition: aDuration [
+
+	self
+		runAnalysisWithFilter: (MTTimeTestFilter for: aDuration)
+		on: { MTAuxiliarClassForTimeTestFilter }
+		withTests: { MTAuxiliarClassForTimeTestFilterTest }
+]
+
+{ #category : 'running' }
+MTTimeTestFilterTest >> testWith10MillisecondsCondition [
+
+	| testCaseReference |
+	testCaseReference := MTTestCaseReference
+		                     for: #test10Milliseconds
+		                     in: MTAuxiliarClassForTimeTestFilterTest.
+	self runAnalysisForTimeCondition:
+		(self timeToRunFor: testCaseReference) * 10.
+
+	self
+		assert: (analysis generalResult particularResults at: 1) runCount
+		equals: 1
+]
+
+{ #category : 'running' }
+MTTimeTestFilterTest >> testWith1SecondCondition [
+
+	| testCaseReference |
+	testCaseReference := MTTestCaseReference
+		                     for: #test1Second
+		                     in: MTAuxiliarClassForTimeTestFilterTest.
+	self runAnalysisForTimeCondition:
+		(self timeToRunFor: testCaseReference) * 10.
+
+	self
+		assert: (analysis generalResult particularResults at: 1) runCount
+		equals: 2
+]
+
+{ #category : 'running' }
+MTTimeTestFilterTest >> timeToRunFor: aTestCaseReference [
+
+	aTestCaseReference runUnchecked.
+	^ aTestCaseReference lastTimeToRun
+]