Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address Pharo12 deprecations #172

Merged
merged 6 commits into from
Feb 4, 2024
Merged

Address Pharo12 deprecations #172

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c89bb8d
remove unneeded class category in Slime tests
Feb 4, 2024
5216ca7
Replace deprecated message
Feb 4, 2024
edd9b01
class packages are important in the tests, as indicated by the failur…
Feb 4, 2024
203d08e
make class package work across all Pharo versions for generating test…
Feb 4, 2024
a886828
remove dead code
Feb 4, 2024
6667894
fix code style
Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/instance/checkMethod..st
View file

This file was deleted.

2 changes: 1 addition & 1 deletion repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Grease-Pharo110-Slime'!
self packageOrganizer ensurePackage: #'Grease-Pharo110-Slime' withTags: #()!
2 changes: 1 addition & 1 deletion ...-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testCompileIntoClassified.st
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,5 @@ testCompileIntoClassified
classified: protocol.

[ self assert: (self class selectors includes: selector).
selectors := self class organization listAtCategoryNamed: protocol.
selectors := self class selectorsInProtocol: protocol.
self assert: selectors = (Array with: selector) ] ensure: [ self class removeSelector: selector ]
2 changes: 1 addition & 1 deletion repository/Grease-Tests-Pharo-Core.package/monticello.meta/categories.st
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Grease-Tests-Pharo-Core'!
self packageOrganizer ensurePackage: #'Grease-Tests-Pharo-Core' withTags: #()!
18 changes: 1 addition & 17 deletions ...sitory/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
accessing-code
defineSubClassOf: aSuperSymbol

| class |
class := SystemVersion current major >= 12
ifTrue: [
factory make: [ :aBuilder |
aBuilder
superclass: (Smalltalk at: aSuperSymbol);
package: self category ] ]
ifFalse: [
factory
newSubclassOf: (Smalltalk at: aSuperSymbol)
instanceVariableNames: ''
classVariableNames: 'classVarsString'
category: self category ].
environment
addClass: class;
addClass: class classSide.
^ class
^ self defineSubClassOf: aSuperSymbol inPackage: self category
20 changes: 20 additions & 0 deletions ...ase-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
accessing-code
defineSubClassOf: aSuperSymbol inPackage: packageName

| class |
class := SystemVersion current major >= 12
ifTrue: [
factory make: [ :aBuilder |
aBuilder
superclass: (Smalltalk at: aSuperSymbol);
package: packageName ] ]
ifFalse: [
factory
newSubclassOf: (Smalltalk at: aSuperSymbol)
instanceVariableNames: ''
classVariableNames: 'classVarsString'
category: packageName ].
environment
addClass: class;
addClass: class classSide.
^ class
3 changes: 1 addition & 2 deletions ...-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,7 @@ tests-block
testReferencesNotPortableClass

| class |
class := self defineSubClassOf: #GRObject.
class category: 'SomeCategory'.
class := self defineSubClassOf: #GRObject inPackage: 'SomeCategory'.
self compile: 'invalid ^ Semaphore new' in: class.
self compile: 'valid ^ GRObject new' in: class.
self
3 changes: 1 addition & 2 deletions ...-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,7 @@ tests-block
testSubclassesNotPortableClass

| class |
class := self defineSubClassOf: #Mutex.
class category: 'SomeCategory'.
class := self defineSubClassOf: #Mutex inPackage: 'SomeCategory'.
self
assertRule: GRSubclassesNotPortableClassRule
matches: { class }
3 changes: 1 addition & 2 deletions ...ory/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testTestCaseFailRule.st
View file
Original file line number Diff line number Diff line change
@@ -6,5 +6,4 @@ testTestCaseFailRule
self compile: 'testMethod self fail' in: class.
self
runTransformation: GRTestAssertionsRule
changes: #(
'testMethod self assert: false' )
changes: #( 'testMethod self assert: false' )
3 changes: 1 addition & 2 deletions ...Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,7 @@ tests-block
testUsesNotPortableClass

| class |
class := self defineSubClassOf: #GRObject.
class category: 'SomeCategory'.
class := self defineSubClassOf: #GRObject inPackage: 'SomeCategory'.
self compile: 'invalid ^ Semaphore new' in: class.
self compile: 'valid ^ GRObject new' in: class.
self
2 changes: 1 addition & 1 deletion repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Grease-Tests-Pharo-Slime'!
self packageOrganizer ensurePackage: #'Grease-Tests-Pharo-Slime' withTags: #()!