Cleanup: CoverageCollectorTest should be in an own test package

Fix #16611
pharo-project · May 13, 2024 · f2472c1 · f2472c1
1 parent a30ed18
commit f2472c1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/BaselineOfSUnit/BaselineOfSUnit.class.st b/src/BaselineOfSUnit/BaselineOfSUnit.class.st
@@ -23,17 +23,16 @@ BaselineOfSUnit class >> defaultPackageNames [
 	^ self packagesOfGroupNamed: #default
 ]
 
-{ #category : 'baseline' }
+{ #category : 'baselines' }
 BaselineOfSUnit >> baseline: spec [
 	<baseline>
 	spec for: #common
 		do: [ 
-
 			spec baseline: 'Traits' with: [
 				spec loads: 'core'. 
-				spec repository: (self packageRepositoryURLForSpec: spec)
-			].
-
+				spec repository: (self packageRepositoryURLForSpec: spec) ].
+
+			"Package definitions"							
 			spec
 				package: 'SUnit-Core';
 				package: 'SUnit-Core-Traits' with: [ spec requires: 'Traits' ];
@@ -46,13 +45,20 @@ BaselineOfSUnit >> baseline: spec [
 				package: 'SUnit-Support-UITesting-Tests';
 				package: 'SUnit-Support-UITesting';
 				package: 'Coverage';
+				package: 'Coverage-Tests' with: [ spec requires: #('Coverage') ];				
 				package: 'JenkinsTools-Core';
 				package: 'JenkinsTools-ExtraReports'.
+
+			"Custom groups"				
 			spec
 				group: 'Core' with: #('SUnit-Core' 'SUnit-Core-Traits' 'SUnit-Visitor');
 				group: 'MockObjects' with: #('SUnit-MockObjects');
 				group: 'UI' with: #('SUnit-UI' 'SUnit-Support-UITesting' 'Coverage');
-				group: 'Tests' with: #('SUnit-Tests' 'SUnit-Support-UITesting-Tests' 'SUnit-Visitor-Tests' 'SUnit-MockObjects-Tests');
-				group: 'JenkinsSupport' with: #('JenkinsTools-Core' 'JenkinsTools-ExtraReports');
+				group: 'Tests' with: #('SUnit-Tests' 'SUnit-Support-UITesting-Tests' 'SUnit-Visitor-Tests' 'SUnit-MockObjects-Tests' 'Coverage-Tests');
+				group: 'JenkinsSupport' with: #('JenkinsTools-Core' 'JenkinsTools-ExtraReports').
+
+			"Virtual groups"	
+			spec
+				group: 'all' with: #('Core' 'MockObjects' 'UI' 'Tests' 'JenkinsSupport');
 				group: 'default' with: #('SUnit-Core' 'SUnit-Core-Traits' 'SUnit-Tests' 'JenkinsTools-Core' 'JenkinsTools-ExtraReports' 'SUnit-MockObjects') ]
 ]
diff --git a/src/Coverage/CoverageCollectorTest.class.st → ...rage-Tests/CoverageCollectorTest.class.st b/src/Coverage/CoverageCollectorTest.class.st → ...rage-Tests/CoverageCollectorTest.class.st
@@ -2,8 +2,7 @@ Class {
 	#name : 'CoverageCollectorTest',
 	#superclass : 'TestCase',
 	#category : 'Coverage-Tests',
-	#package : 'Coverage',
-	#tag : 'Tests'
+	#package : 'Coverage-Tests'
 }
 
 { #category : 'example' }

diff --git a/src/Coverage-Tests/package.st b/src/Coverage-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : 'Coverage-Tests' }
diff --git a/src/Tools-Tests/ProjectManagerTest.class.st b/src/Tools-Tests/ProjectManagerTest.class.st
@@ -14,7 +14,7 @@ ProjectManagerTest >> testPackagesInAProject [
 	self
 		assertCollection:
 			#( 'BaselineOfSUnit' 'SUnit-Core' 'SUnit-Core-Traits' 'SUnit-Tests' 'SUnit-Visitor' 'SUnit-Visitor-Tests' 'SUnit-MockObjects' 'SUnit-MockObjects-Tests'
-			   'SUnit-UI' 'Coverage' 'JenkinsTools-Core' 'JenkinsTools-ExtraReports' 'SUnit-Support-UITesting-Tests' 'SUnit-Support-UITesting' )
+			   'SUnit-UI' 'Coverage' 'JenkinsTools-Core' 'JenkinsTools-ExtraReports' 'SUnit-Support-UITesting-Tests' 'SUnit-Support-UITesting' 'Coverage-Tests')
 		hasSameElements: (sUnitProject packages collect: [ :package | package name ])
 ]