create desired test environment for every test in the suite. Remove i…

…mplementations of runTestsBy:
pavel-krivanek · Nov 22, 2019 · 8354cb0 · 8354cb0
1 parent 882b055
commit 8354cb0
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 60 deletions.
diff --git a/src/DrTests-CommentsToTests/DTCommentToTest.class.st b/src/DrTests-CommentsToTests/DTCommentToTest.class.st
@@ -87,10 +87,9 @@ DTCommentToTest >> runSuite: aTestSuite withResult: aResult [
 DTCommentToTest >> runTestSuites: testSuites [
 	| result |
 	result := TestAsserter classForTestResult new.
-	CurrentExecutionEnvironment
-		runTestsBy: [ testSuites
-				do: [ :testSuite | self runSuite: testSuite withResult: result ]
-				displayingProgress: 'Running Tests' ].
+	testSuites
+		do: [ :testSuite | self runSuite: testSuite withResult: result ]
+		displayingProgress: 'Running Tests'.
 	^ result
 ]
 

diff --git a/src/DrTests-TestCoverage/DTTestCoverage.class.st b/src/DrTests-TestCoverage/DTTestCoverage.class.st
@@ -109,10 +109,9 @@ DTTestCoverage >> runSuite: aTestSuite withResult: aResult [
 DTTestCoverage >> runTestSuites: testSuites [
 	| result |
 	result := TestAsserter classForTestResult new.
-	CurrentExecutionEnvironment
-		runTestsBy: [ testSuites
-				do: [ :testSuite | self runSuite: testSuite withResult: result ]
-				displayingProgress: 'Running Tests' ].
+	testSuites
+		do: [ :testSuite | self runSuite: testSuite withResult: result ]
+		displayingProgress: 'Running Tests'.
 ]
 
 { #category : #api }

diff --git a/src/DrTests-TestsRunner/DTTestsRunner.class.st b/src/DrTests-TestsRunner/DTTestsRunner.class.st
@@ -139,11 +139,9 @@ DTTestsRunner >> runSuite: aTestSuite withResult: aResult [
 DTTestsRunner >> runTestSuites: testSuites [ 
 	|result|
 	result := TestAsserter classForTestResult new.
-	CurrentExecutionEnvironment runTestsBy: [
-		testSuites
-			do: [:testSuite | self runSuite: testSuite withResult: result ]
-			displayingProgress: 'Running Tests'
-	].
+	testSuites
+		do: [:testSuite | self runSuite: testSuite withResult: result ]
+		displayingProgress: 'Running Tests'.
 	^ result
 ]
 

diff --git a/src/JenkinsTools-Core/HDTestReport.class.st b/src/JenkinsTools-Core/HDTestReport.class.st
@@ -169,9 +169,12 @@ HDTestReport >> run [
 
 { #category : #running }
 HDTestReport >> runAll [
-	CurrentExecutionEnvironment runTestsBy: [ 
-		suite tests do: [ :each | each run: self ]
-	]
+
+	suite tests do: [ :aTestCase | 
+		| testEnv |
+		testEnv := aTestCase executionEnvironmentClass new.
+		testEnv beActiveDuring: [
+			aTestCase run: self ] ]
 ]
 
 { #category : #running }

diff --git a/src/SUnit-Core/CurrentExecutionEnvironment.extension.st b/src/SUnit-Core/CurrentExecutionEnvironment.extension.st
@@ -6,9 +6,3 @@ CurrentExecutionEnvironment class >> runTestCase: aTestCase [
 	self value runTestCase: aTestCase
 
 ]
-
-{ #category : #'*SUnit-Core' }
-CurrentExecutionEnvironment class >> runTestsBy: aBlock [
-
-	self value runTestsBy: aBlock
-]
diff --git a/src/SUnit-Core/DefaultExecutionEnvironment.extension.st b/src/SUnit-Core/DefaultExecutionEnvironment.extension.st
@@ -9,9 +9,3 @@ DefaultExecutionEnvironment >> runTestCase: aTestCase [
 	testEnv beActiveDuring: [
 		testEnv runTestCase: aTestCase]
 ]
-
-{ #category : #'*SUnit-Core' }
-DefaultExecutionEnvironment >> runTestsBy: aBlock [
-
-	TestExecutionEnvironment new beActiveDuring: aBlock
-]
diff --git a/src/SUnit-Core/ExecutionEnvironment.extension.st b/src/SUnit-Core/ExecutionEnvironment.extension.st
@@ -5,9 +5,3 @@ ExecutionEnvironment >> runTestCase: aTestCase [
 
 	self subclassResponsibility 
 ]
-
-{ #category : #'*SUnit-Core' }
-ExecutionEnvironment >> runTestsBy: aBlock [
-
-	self subclassResponsibility 
-]
diff --git a/src/SUnit-Core/TestCase.class.st b/src/SUnit-Core/TestCase.class.st
@@ -821,5 +821,5 @@ TestCase >> tearDown [
 
 { #category : #accessing }
 TestCase >> timeLimit: aDuration [
-	^TestExecutionEnvironment maxTimeForTest: aDuration
+	^CurrentExecutionEnvironment value maxTimeForTest: aDuration
 ]
diff --git a/src/SUnit-Core/TestExecutionEnvironment.class.st b/src/SUnit-Core/TestExecutionEnvironment.class.st
@@ -54,12 +54,6 @@ TestExecutionEnvironment class >> fuelIgnoredInstanceVariableNames [
     ^#('watchDogProcess' 'watchDogSemaphore' 'forkedProcesses' 'failedProcesses')
 ]
 
-{ #category : #controlling }
-TestExecutionEnvironment class >> maxTimeForTest: aDuration [
-
-	CurrentExecutionEnvironment value maxTimeForTest: aDuration
-]
-
 { #category : #controlling }
 TestExecutionEnvironment class >> resetFailures [
 
@@ -197,12 +191,6 @@ TestExecutionEnvironment >> runTestCaseSafelly: aTestCase [
 		err pass  ]
 ]
 
-{ #category : #controlling }
-TestExecutionEnvironment >> runTestsBy: aBlock [
-
-	aBlock value
-]
-
 { #category : #accessing }
 TestExecutionEnvironment >> testCase [
 	^ testCase

diff --git a/src/SUnit-Core/TestSuite.class.st b/src/SUnit-Core/TestSuite.class.st
@@ -127,19 +127,22 @@ TestSuite >> run [
 
 { #category : #running }
 TestSuite >> run: aResult [
-	CurrentExecutionEnvironment runTestsBy: [
-		self runUnmanaged: aResult ]
+
+	self runTestsInOnwEnvironments: aResult
 ]
 
 { #category : #running }
-TestSuite >> runUnmanaged: aResult [
+TestSuite >> runTestsInOnwEnvironments: aResult [
 	self setUp.
 	[ self tests
-		do: [ :each | 
-			each run: aResult.
-			self announceTest: each.
-			self changed: each ] ]
-		ensure: [ self tearDown ]
+		do: [ :aTestCase | 
+			| testEnv |
+			testEnv := aTestCase executionEnvironmentClass new.
+			testEnv beActiveDuring: [
+				aTestCase run: aResult.
+				self announceTest: aTestCase.
+				self changed: aTestCase ] ] 
+	] ensure: [ self tearDown ]
 ]
 
 { #category : #running }

diff --git a/src/SUnit-UI/TestRunner.class.st b/src/SUnit-UI/TestRunner.class.st
@@ -893,11 +893,9 @@ TestRunner >> runTest: aTestCase [
 
 { #category : #actions }
 TestRunner >> runTestSuites: testSuites [ 
-	CurrentExecutionEnvironment runTestsBy: [
-		testSuites
-			do: [:testSuite | self runSuite: testSuite]
-			displayingProgress: 'Running Tests'
-	]
+	testSuites
+		do: [:testSuite | self runSuite: testSuite]
+		displayingProgress: 'Running Tests'
 ]
 
 { #category : #'history saving' }