diff --git a/source/BaselineOfBell/BaselineOfBell.class.st b/source/BaselineOfBell/BaselineOfBell.class.st index 70c19c1..08c7ac7 100644 --- a/source/BaselineOfBell/BaselineOfBell.class.st +++ b/source/BaselineOfBell/BaselineOfBell.class.st @@ -1,10 +1,11 @@ Class { - #name : #BaselineOfBell, - #superclass : #BaselineOf, - #category : #BaselineOfBell + #name : 'BaselineOfBell', + #superclass : 'BaselineOf', + #category : 'BaselineOfBell', + #package : 'BaselineOfBell' } -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfBell >> baseline: spec [ @@ -19,7 +20,7 @@ BaselineOfBell >> baseline: spec [ group: 'default' with: 'Development' ] ] -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfBell >> setUpDependencies: spec [ spec @@ -27,7 +28,7 @@ BaselineOfBell >> setUpDependencies: spec [ project: 'NeoJSON-Deployment' copyFrom: 'NeoJSON' with: [ spec loads: 'Deployment' ]. ] -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfBell >> setUpDeploymentPackages: spec [ spec @@ -36,7 +37,7 @@ BaselineOfBell >> setUpDeploymentPackages: spec [ ] -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfBell >> setUpPackages: spec [ self @@ -46,19 +47,24 @@ BaselineOfBell >> setUpPackages: spec [ ] -{ #category : #initialization } +{ #category : 'initialization' } BaselineOfBell >> setUpSUnitPackages: spec [ - spec - package: 'Bell-SUnit' with: [ spec requires: #( 'Bell-Logging' ) ]; - group: 'Dependent-SUnit-Extensions' with: 'Bell-SUnit' + spec + package: 'Bell-SUnit' with: [ spec requires: #( 'Bell-Logging' ) ]; + group: 'Dependent-SUnit-Extensions' with: 'Bell-SUnit'. + spec for: #( #'pharo10.x' #'pharo11.x' #'pharo12.x' ) do: [ + spec + package: 'Bell-Pharo-10-Extensions'; + group: 'Dependent-SUnit-Extensions' with: 'Bell-Pharo-10-Extensions' + ] ] -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfBell >> setUpTestPackages: spec [ - spec - package: 'Bell-Logging-Tests' - with: [ spec requires: #( 'Bell-Logging' 'Bell-SUnit' ) ]; - group: 'Tests' with: 'Bell-Logging-Tests'. + spec + package: 'Bell-Logging-Tests' + with: [ spec requires: #( 'Bell-Logging' 'Dependent-SUnit-Extensions' ) ]; + group: 'Tests' with: 'Bell-Logging-Tests' ] diff --git a/source/BaselineOfBell/package.st b/source/BaselineOfBell/package.st index 193b46c..c21b266 100644 --- a/source/BaselineOfBell/package.st +++ b/source/BaselineOfBell/package.st @@ -1 +1 @@ -Package { #name : #BaselineOfBell } +Package { #name : 'BaselineOfBell' } diff --git a/source/Beacon-GS64/MemoryLogger.class.st b/source/Beacon-GS64/MemoryLogger.class.st index 0d4c979..fe8b3cc 100644 --- a/source/Beacon-GS64/MemoryLogger.class.st +++ b/source/Beacon-GS64/MemoryLogger.class.st @@ -45,6 +45,12 @@ MemoryLogger >> announcer [ ^ announcer ] +{ #category : #accessing } +MemoryLogger >> entries [ + + ^ self recordings +] + { #category : #initialization } MemoryLogger >> initialize [ super initialize. diff --git a/source/Bell-Pharo-10-Extensions/MemoryLogger.extension.st b/source/Bell-Pharo-10-Extensions/MemoryLogger.extension.st new file mode 100644 index 0000000..5f61c17 --- /dev/null +++ b/source/Bell-Pharo-10-Extensions/MemoryLogger.extension.st @@ -0,0 +1,7 @@ +Extension { #name : 'MemoryLogger' } + +{ #category : '*Bell-Pharo-10-Extensions' } +MemoryLogger >> entries [ + + ^ self recordings +] diff --git a/source/Bell-Pharo-10-Extensions/package.st b/source/Bell-Pharo-10-Extensions/package.st new file mode 100644 index 0000000..94fe8d6 --- /dev/null +++ b/source/Bell-Pharo-10-Extensions/package.st @@ -0,0 +1 @@ +Package { #name : 'Bell-Pharo-10-Extensions' } diff --git a/source/Bell-SUnit/LoggingAsserter.class.st b/source/Bell-SUnit/LoggingAsserter.class.st index 3c0c844..03869d7 100644 --- a/source/Bell-SUnit/LoggingAsserter.class.st +++ b/source/Bell-SUnit/LoggingAsserter.class.st @@ -25,14 +25,14 @@ LoggingAsserter class >> on: aTestCase [ { #category : 'asserting' } LoggingAsserter >> assertLogRecordsMatch: anExpectedLogEntryCollection [ - memoryLogger recordings with: anExpectedLogEntryCollection do: [ :record :expectedLogEntry | - testCase assert: ( record printString includesSubstring: expectedLogEntry ) ] + self logRecords with: anExpectedLogEntryCollection do: [ :record :expectedLogEntry | + testCase assert: ( record printString includesSubstring: expectedLogEntry ) ] ] { #category : 'asserting' } LoggingAsserter >> assertLogRecordsMatchUsing: aRegexCollection [ - memoryLogger recordings with: aRegexCollection do: [ :record :regexExpression | + self logRecords with: aRegexCollection do: [ :record :regexExpression | testCase assert: ( record printString matchesRegex: regexExpression ) description: @@ -47,6 +47,12 @@ LoggingAsserter >> initializeOn: aTestCase [ testCase := aTestCase ] +{ #category : 'accessing' } +LoggingAsserter >> logRecords [ + + ^ memoryLogger entries +] + { #category : 'running' } LoggingAsserter >> runMemoryLoggerDuring: aBlockClosure [ @@ -56,5 +62,6 @@ LoggingAsserter >> runMemoryLoggerDuring: aBlockClosure [ { #category : 'running' } LoggingAsserter >> stopLoggers [ - memoryLogger reset + memoryLogger reset. + MemoryLogger resetInstance ]