From c0ed10d7ec2a479d33a563d55a6cffa580b25bec Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 21:27:55 +0200 Subject: [PATCH] Remove old compatibility method --- .../instance/testExpireAbsolute.st | 3 +-- .../instance/testExpireRelative.st | 2 +- .../instance/testInitialCount.st | 5 ++--- .../instance/testSendUnregistered.st | 3 +-- .../instance/workAroundPharo3Bug.st | 5 ----- .../monticello.meta/categories.st | 13 +------------ 6 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/workAroundPharo3Bug.st diff --git a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireAbsolute.st b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireAbsolute.st index dd67a3993..c12748231 100644 --- a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireAbsolute.st +++ b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireAbsolute.st @@ -10,9 +10,8 @@ testExpireAbsolute 1 should be expired 2 should not be expired" + | delay absent | - self workAroundPharo3Bug. - cache := WABulkReapingCache initialSize: 13 maximumSize: 10 diff --git a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireRelative.st b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireRelative.st index 3be0a4580..39e551e9a 100644 --- a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireRelative.st +++ b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testExpireRelative.st @@ -11,8 +11,8 @@ testExpireRelative 1 should not be expired 2 should be expired" + | delay absent | - self workAroundPharo3Bug. cache := WABulkReapingCache initialSize: 13 diff --git a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testInitialCount.st b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testInitialCount.st index 7e4808345..d336216b6 100644 --- a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testInitialCount.st +++ b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testInitialCount.st @@ -1,8 +1,7 @@ testing testInitialCount - | counter | - self workAroundPharo3Bug. - + + | counter | counter := GRPlatform current newReducedConflictCounter. self assert: counter value equals: 0. counter increment. diff --git a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testSendUnregistered.st b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testSendUnregistered.st index d809b65a1..d708001ce 100644 --- a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testSendUnregistered.st +++ b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/testSendUnregistered.st @@ -7,9 +7,8 @@ testSendUnregistered wait 2 sec 1 should be expired and have received #unregistered" - | delay value absent | - self workAroundPharo3Bug. + | delay value absent | cache := WABulkReapingCache initialSize: 13 maximumSize: 10 diff --git a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/workAroundPharo3Bug.st b/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/workAroundPharo3Bug.st deleted file mode 100644 index 94322ffe4..000000000 --- a/repository/Seaside-Tests-Core.package/WABulkReapingCacheTest.class/instance/workAroundPharo3Bug.st +++ /dev/null @@ -1,5 +0,0 @@ -private -workAroundPharo3Bug - "apparently the first delay you execute in a Pharo 3 image gets ignored - fixed in Pharo 4" - (Delay forMilliseconds: 1) wait \ No newline at end of file diff --git a/repository/Seaside-Tests-Core.package/monticello.meta/categories.st b/repository/Seaside-Tests-Core.package/monticello.meta/categories.st index db0a0751b..003114d97 100644 --- a/repository/Seaside-Tests-Core.package/monticello.meta/categories.st +++ b/repository/Seaside-Tests-Core.package/monticello.meta/categories.st @@ -1,12 +1 @@ -SystemOrganization addCategory: #'Seaside-Tests-Core'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Backtracking'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Cache'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Callbacks'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Configuration'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Document'! -SystemOrganization addCategory: #'Seaside-Tests-Core-HTTP'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Libraries'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Rendering'! -SystemOrganization addCategory: #'Seaside-Tests-Core-RequestHandling'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Server'! -SystemOrganization addCategory: #'Seaside-Tests-Core-Utilities'! +self packageOrganizer ensurePackage: #'Seaside-Tests-Core' withTags: #('Backtracking' 'Cache' 'Callbacks' 'Configuration' 'Document' 'HTTP' 'Libraries' 'Rendering' 'RequestHandling' 'Server' 'Utilities')!