Skip to content

Commit

Permalink
Use platform aware class in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
theseion authored and fniephaus committed Dec 10, 2023
1 parent 3f277b9 commit e03bd96
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
executing
addLoadedClassesFrom: goferReferences
self loadedClasses addAll: (
SmalltalkCI classesWithPackageNames: (
SmalltalkCI platformClass classesWithPackageNames: (
goferReferences collect: [ :ref | ref packageName ] ))
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class organization
classesInPackage: packageName
^ self platformClass classesInPackage: packageName
^ self classesInPackage: packageName
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ classesToTest
ifFalse: [ "By default, add all classes that have been loaded by compatible LoadSpecs"
self compatibleLoadSpecs do: [ :each | classes addAll: each loadedClasses ] ].
self testing at: #'include'
ifPresent: [ :includeDict | classes addAll: (SmalltalkCI classesFrom: includeDict) ].
ifPresent: [ :includeDict | classes addAll: (SmalltalkCI platformClass platformClass classesFrom: includeDict) ].
self testing at: #'exclude'
ifPresent: [ :excludeDict | classes removeAllFoundIn: (SmalltalkCI classesFrom: excludeDict) ].
ifPresent: [ :excludeDict | classes removeAllFoundIn: (SmalltalkCI platformClass classesFrom: excludeDict) ].
^ classes select: [ :cl | cl inheritsFrom: TestCase ]
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ allClassesToCover

ignoredClasses := (self allClassesNotUnderTestOf: classes) asSet.
"Ignore system classes to avoid infinite recursions during coverage testing"
ignoredClasses addAll: (SmalltalkCI classesForPackages: self class ignoredPackages).
ignoredClasses addAll: (SmalltalkCI platformClass classesForPackages: self class ignoredPackages).

classes removeAllFoundIn: (self classesAndMetaclassesOf: ignoredClasses).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ allPackagesUnderTestOf: classes
^ (classes
select: [ :class | (self theMetaClassOf: class) includesSelector: #packageNamesUnderTest])
gather: [ :class | (self theNonMetaClassOf: class) packageNamesUnderTest
gather: [ :packageName | SmalltalkCI classesInPackage: packageName ]]
gather: [ :packageName | SmalltalkCI platformClass classesInPackage: packageName ]]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
helpers
classesToCoverForPackages
^ self coverageAt: #packages
do: [ :packageNames | SmalltalkCI classesForPackages: packageNames ]
do: [ :packageNames | SmalltalkCI platformClass classesForPackages: packageNames ]
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ testClassesToTest
self deny: (classes includes: SCIExcludedTests).

self spec testing: Dictionary new.
classes := SmalltalkCI classesFrom: (Dictionary new
classes := SmalltalkCI platformClass classesFrom: (Dictionary new
add: #'projects' -> #('SmalltalkCI');
yourself).
self spec classesToTest allSatisfy: [ :cl | classes includes: cl]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ testClassesForCategories
self assert: (classes includes: SmalltalkCISpec).
self deny: (classes includes: SmalltalkCITest).
self deny: (classes includes: SmalltalkCISpecTest).
self assert: classes size equals: (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
self assert: classes size equals: (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core') size.

classes := SmalltalkCI platformClass classesForCategories: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec).
self assert: (classes includes: SmalltalkCITest).
self assert: (classes includes: SmalltalkCISpecTest).
self deny: (classes includes: Object).
size := (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
size := size + (SmalltalkCI classesInCategory: 'SmalltalkCI-Tests') size.
size := (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core') size.
size := size + (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Tests') size.
self assert: classes size equals: size.
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
testing
testClassesForPackages
| classes size |
classes := SmalltalkCI classesForPackages: #('SmalltalkCI-Core').
classes := SmalltalkCI platformClass classesForPackages: #('SmalltalkCI-Core').
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec).
self deny: (classes includes: SmalltalkCITest).
self deny: (classes includes: SmalltalkCISpecTest).
self assert: classes size equals: (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
self assert: classes size equals: (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.

classes := SmalltalkCI classesForPackages: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
classes := SmalltalkCI platformClass classesForPackages: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec).
self assert: (classes includes: SmalltalkCITest).
self assert: (classes includes: SmalltalkCISpecTest).
self deny: (classes includes: Object).
size := (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
size := size + (SmalltalkCI classesInPackage: 'SmalltalkCI-Tests') size.
size := (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.
size := size + (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Tests') size.
self assert: classes size equals: size.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
testing
testClassesInPackage
| classes |
classes := SmalltalkCI classesInPackage: 'SmalltalkCI-Core'.
classes := SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core'.
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec).
self deny: (classes includes: SmalltalkCITest).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
testing
testClassesOfProjects
| classes |
classes := SmalltalkCI classesOfProjects: #('SomeNonExistingProject').
classes := SmalltalkCI platformClass classesOfProjects: #('SomeNonExistingProject').
self assert: classes size = 0.

classes := SmalltalkCI classesOfProjects: #('SmalltalkCI').
classes := SmalltalkCI platformClass classesOfProjects: #('SmalltalkCI').
self assert: classes size > 0.
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec)
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
testing
testClassesWithPackageNames
| classes size |
classes := SmalltalkCI classesWithPackageNames: #('SmalltalkCI-Core').
classes := SmalltalkCI platformClass classesWithPackageNames: #('SmalltalkCI-Core').
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec).
self deny: (classes includes: SmalltalkCITest).
self deny: (classes includes: SmalltalkCISpecTest).
self assert: classes size equals: (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
self assert: classes size equals: (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.

classes := SmalltalkCI classesWithPackageNames: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
classes := SmalltalkCI platformClass classesWithPackageNames: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
self assert: (classes includes: SmalltalkCI).
self assert: (classes includes: SmalltalkCISpec).
self assert: (classes includes: SmalltalkCITest).
self assert: (classes includes: SmalltalkCISpecTest).
self deny: (classes includes: Object).
size := (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
size := size + (SmalltalkCI classesInPackage: 'SmalltalkCI-Tests') size.
size := (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.
size := size + (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Tests') size.
self assert: classes size equals: size.

0 comments on commit e03bd96

Please sign in to comment.