From 15de1b65e788d1391fc8732b8369cb9e340c3b3c Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Jan 2025 18:39:49 +0100 Subject: [PATCH 1/4] Move ClassDefinitionPrinters loading later in the bootstrap process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ClassDefinitionPrinters package is currently loaded by Hermes alongside the compiler. But this is needed only for tooling, the compiler does not need it except in the UI  package. I propose to load it later in the bootstrap process so that it gets loaded by Metacello normaly and not by Hermes --- bootstrap/scripts/4-build.sh | 2 +- src/BaselineOfBasicTools/BaselineOfBasicTools.class.st | 3 ++- src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bootstrap/scripts/4-build.sh b/bootstrap/scripts/4-build.sh index 6ab9e0f6a21..6de4c981653 100755 --- a/bootstrap/scripts/4-build.sh +++ b/bootstrap/scripts/4-build.sh @@ -147,7 +147,7 @@ ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" perform --save SystemVers ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes InitializePackagesCommandLineHandler.hermes --save -${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Collections-Atomic.hermes AST-Core.hermes Collections-Arithmetic.hermes ClassDefinitionPrinters.hermes System-SourcesCondenser.hermes System-NumberPrinting.hermes --save --no-fail-on-undeclared +${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Collections-Atomic.hermes AST-Core.hermes Collections-Arithmetic.hermes System-SourcesCondenser.hermes System-NumberPrinting.hermes --save --no-fail-on-undeclared echo $(date -u) "[Compiler] Initializing the packages in the Kernel" ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" initializePackages --protocols=protocolsKernel.txt --packages --save diff --git a/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st b/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st index ba02af5abff..a4c35618354 100644 --- a/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st +++ b/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st @@ -61,7 +61,8 @@ BaselineOfBasicTools >> baseline: spec [ spec loads: 'Core'; repository: repository ]. - + + spec package: 'ClassDefinitionPrinters'. spec package: 'Tool-ProcessBrowser'. spec package: 'Tool-Profilers'. spec package: 'NECompletion'. diff --git a/src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st b/src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st index 0d2d6d8bef1..20b8049d3c6 100644 --- a/src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st +++ b/src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st @@ -84,7 +84,6 @@ BaselineOfPharoBootstrap >> baseline: spec [ spec package: 'Collections-Support'. spec package: 'Collections-Unordered'. spec package: 'Collections-Weak'. - spec package: 'ClassDefinitionPrinters'. spec package: 'Debugging-Core'. spec package: 'Files'. spec package: 'FileSystem-Path'. @@ -206,7 +205,6 @@ BaselineOfPharoBootstrap >> baseline: spec [ 'Collections-Atomic'. 'CodeImport'. 'CodeImportCommandLineHandlers'. - 'ClassDefinitionPrinters'. 'System-SourcesCondenser'. 'Debugging-Utils'. 'OpalCompiler-Core'}. From 05b93183791f76ae53eaefa3e258996d73b24703 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 22 Jan 2025 14:49:32 +0100 Subject: [PATCH 2/4] Move some extension methods in their defining classes --- src/ClassDefinitionPrinters/ByteLayout.extension.st | 9 --------- .../CompiledMethodLayout.extension.st | 10 ---------- .../DoubleByteLayout.extension.st | 9 --------- .../DoubleWordLayout.extension.st | 9 --------- .../EphemeronLayout.extension.st | 9 --------- .../ImmediateLayout.extension.st | 9 --------- src/ClassDefinitionPrinters/ObjectLayout.extension.st | 10 ---------- .../VariableLayout.extension.st | 9 --------- src/ClassDefinitionPrinters/WeakLayout.extension.st | 9 --------- src/ClassDefinitionPrinters/WordLayout.extension.st | 9 --------- src/Kernel-CodeModel/ByteLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/CompiledMethodLayout.class.st | 9 +++++++++ src/Kernel-CodeModel/DoubleByteLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/DoubleWordLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/EphemeronLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/ImmediateLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/ObjectLayout.class.st | 10 ++++++++++ src/Kernel-CodeModel/VariableLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/WeakLayout.class.st | 8 ++++++++ src/Kernel-CodeModel/WordLayout.class.st | 8 ++++++++ 20 files changed, 83 insertions(+), 92 deletions(-) delete mode 100644 src/ClassDefinitionPrinters/ByteLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/CompiledMethodLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/DoubleByteLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/DoubleWordLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/EphemeronLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/ImmediateLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/VariableLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/WeakLayout.extension.st delete mode 100644 src/ClassDefinitionPrinters/WordLayout.extension.st diff --git a/src/ClassDefinitionPrinters/ByteLayout.extension.st b/src/ClassDefinitionPrinters/ByteLayout.extension.st deleted file mode 100644 index db5db5881d9..00000000000 --- a/src/ClassDefinitionPrinters/ByteLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'ByteLayout' } - -{ #category : '*ClassDefinitionPrinters' } -ByteLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#variableByteSubclass: -] diff --git a/src/ClassDefinitionPrinters/CompiledMethodLayout.extension.st b/src/ClassDefinitionPrinters/CompiledMethodLayout.extension.st deleted file mode 100644 index beb2f7980b5..00000000000 --- a/src/ClassDefinitionPrinters/CompiledMethodLayout.extension.st +++ /dev/null @@ -1,10 +0,0 @@ -Extension { #name : 'CompiledMethodLayout' } - -{ #category : '*ClassDefinitionPrinters' } -CompiledMethodLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - "there is no way to define classes of this Layput, the system shows them as variable classes" - ^#variableByteSubclass: -] diff --git a/src/ClassDefinitionPrinters/DoubleByteLayout.extension.st b/src/ClassDefinitionPrinters/DoubleByteLayout.extension.st deleted file mode 100644 index 1f11dd2b99f..00000000000 --- a/src/ClassDefinitionPrinters/DoubleByteLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'DoubleByteLayout' } - -{ #category : '*ClassDefinitionPrinters' } -DoubleByteLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#variableDoubleByteSubclass: -] diff --git a/src/ClassDefinitionPrinters/DoubleWordLayout.extension.st b/src/ClassDefinitionPrinters/DoubleWordLayout.extension.st deleted file mode 100644 index ccf0ab9d7cb..00000000000 --- a/src/ClassDefinitionPrinters/DoubleWordLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'DoubleWordLayout' } - -{ #category : '*ClassDefinitionPrinters' } -DoubleWordLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#variableDoubleWordSubclass: -] diff --git a/src/ClassDefinitionPrinters/EphemeronLayout.extension.st b/src/ClassDefinitionPrinters/EphemeronLayout.extension.st deleted file mode 100644 index 4f444f31ca9..00000000000 --- a/src/ClassDefinitionPrinters/EphemeronLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'EphemeronLayout' } - -{ #category : '*ClassDefinitionPrinters' } -EphemeronLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#ephemeronSubclass: -] diff --git a/src/ClassDefinitionPrinters/ImmediateLayout.extension.st b/src/ClassDefinitionPrinters/ImmediateLayout.extension.st deleted file mode 100644 index 0d231718b96..00000000000 --- a/src/ClassDefinitionPrinters/ImmediateLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'ImmediateLayout' } - -{ #category : '*ClassDefinitionPrinters' } -ImmediateLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#immediateSubclass: -] diff --git a/src/ClassDefinitionPrinters/ObjectLayout.extension.st b/src/ClassDefinitionPrinters/ObjectLayout.extension.st index 1042ff565a3..49816659ddc 100644 --- a/src/ClassDefinitionPrinters/ObjectLayout.extension.st +++ b/src/ClassDefinitionPrinters/ObjectLayout.extension.st @@ -15,13 +15,3 @@ ObjectLayout >> subclassDefiningSymbol [ supported" ^self class subclassDefiningSymbol ] - -{ #category : '*ClassDefinitionPrinters' } -ObjectLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - "As a fallback we just return a standard class creation symbol. This will be called for user - defined Layouts, for old style class definitions that can not support user defined Layouts" - ^#subclass: -] diff --git a/src/ClassDefinitionPrinters/VariableLayout.extension.st b/src/ClassDefinitionPrinters/VariableLayout.extension.st deleted file mode 100644 index 4a8f38262e5..00000000000 --- a/src/ClassDefinitionPrinters/VariableLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'VariableLayout' } - -{ #category : '*ClassDefinitionPrinters' } -VariableLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#variableSubclass: -] diff --git a/src/ClassDefinitionPrinters/WeakLayout.extension.st b/src/ClassDefinitionPrinters/WeakLayout.extension.st deleted file mode 100644 index d8cdf346e27..00000000000 --- a/src/ClassDefinitionPrinters/WeakLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'WeakLayout' } - -{ #category : '*ClassDefinitionPrinters' } -WeakLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#weakSubclass: -] diff --git a/src/ClassDefinitionPrinters/WordLayout.extension.st b/src/ClassDefinitionPrinters/WordLayout.extension.st deleted file mode 100644 index add4eb49f07..00000000000 --- a/src/ClassDefinitionPrinters/WordLayout.extension.st +++ /dev/null @@ -1,9 +0,0 @@ -Extension { #name : 'WordLayout' } - -{ #category : '*ClassDefinitionPrinters' } -WordLayout class >> subclassDefiningSymbol [ - "Answer a keyword that describes the receiver's kind of subclass - Note: this is for printing the ST80 style class definiton, usage makes no sense for anything - else!" - ^#variableWordSubclass: -] diff --git a/src/Kernel-CodeModel/ByteLayout.class.st b/src/Kernel-CodeModel/ByteLayout.class.st index 9038818a39a..baf423967d0 100644 --- a/src/Kernel-CodeModel/ByteLayout.class.st +++ b/src/Kernel-CodeModel/ByteLayout.class.st @@ -16,6 +16,14 @@ ByteLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +ByteLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#variableByteSubclass: +] + { #category : 'accessing' } ByteLayout >> bytesPerSlot [ diff --git a/src/Kernel-CodeModel/CompiledMethodLayout.class.st b/src/Kernel-CodeModel/CompiledMethodLayout.class.st index 8ae1cf1011e..b0ff1d80b10 100644 --- a/src/Kernel-CodeModel/CompiledMethodLayout.class.st +++ b/src/Kernel-CodeModel/CompiledMethodLayout.class.st @@ -19,6 +19,15 @@ CompiledMethodLayout class >> extending: superLayout scope: aScope host: aClass yourself ] +{ #category : 'description' } +CompiledMethodLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + "there is no way to define classes of this Layput, the system shows them as variable classes" + ^#variableByteSubclass: +] + { #category : 'extending' } CompiledMethodLayout >> extend [ self error: 'CompiledMethodLayout can not be extendend' diff --git a/src/Kernel-CodeModel/DoubleByteLayout.class.st b/src/Kernel-CodeModel/DoubleByteLayout.class.st index bc0aeee850d..e9d0ad00c80 100644 --- a/src/Kernel-CodeModel/DoubleByteLayout.class.st +++ b/src/Kernel-CodeModel/DoubleByteLayout.class.st @@ -16,6 +16,14 @@ DoubleByteLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +DoubleByteLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#variableDoubleByteSubclass: +] + { #category : 'accessing' } DoubleByteLayout >> bytesPerSlot [ diff --git a/src/Kernel-CodeModel/DoubleWordLayout.class.st b/src/Kernel-CodeModel/DoubleWordLayout.class.st index 1003166710a..973db854af7 100644 --- a/src/Kernel-CodeModel/DoubleWordLayout.class.st +++ b/src/Kernel-CodeModel/DoubleWordLayout.class.st @@ -16,6 +16,14 @@ DoubleWordLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +DoubleWordLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#variableDoubleWordSubclass: +] + { #category : 'extending' } DoubleWordLayout >> extendDoubleWord [ ^ DoubleWordLayout new diff --git a/src/Kernel-CodeModel/EphemeronLayout.class.st b/src/Kernel-CodeModel/EphemeronLayout.class.st index 85331f93073..8974f8bfcb9 100644 --- a/src/Kernel-CodeModel/EphemeronLayout.class.st +++ b/src/Kernel-CodeModel/EphemeronLayout.class.st @@ -17,6 +17,14 @@ EphemeronLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +EphemeronLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#ephemeronSubclass: +] + { #category : 'format' } EphemeronLayout >> instanceSpecification [ ^ 5 diff --git a/src/Kernel-CodeModel/ImmediateLayout.class.st b/src/Kernel-CodeModel/ImmediateLayout.class.st index 7a10d5baa39..3b30573ac5c 100644 --- a/src/Kernel-CodeModel/ImmediateLayout.class.st +++ b/src/Kernel-CodeModel/ImmediateLayout.class.st @@ -18,6 +18,14 @@ ImmediateLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +ImmediateLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#immediateSubclass: +] + { #category : 'extending' } ImmediateLayout >> extend [ self error: 'ImmediateLayout can not be extendend' diff --git a/src/Kernel-CodeModel/ObjectLayout.class.st b/src/Kernel-CodeModel/ObjectLayout.class.st index 0d403627066..c7fffb1ced2 100644 --- a/src/Kernel-CodeModel/ObjectLayout.class.st +++ b/src/Kernel-CodeModel/ObjectLayout.class.st @@ -32,6 +32,16 @@ ObjectLayout class >> layoutForSubclassDefiningSymbol: aSymbol [ ifNone: [ FixedLayout ] ] +{ #category : 'description' } +ObjectLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + "As a fallback we just return a standard class creation symbol. This will be called for user + defined Layouts, for old style class definitions that can not support user defined Layouts" + ^#subclass: +] + { #category : 'extending' } ObjectLayout >> extend [ "Answer a default extension of me." diff --git a/src/Kernel-CodeModel/VariableLayout.class.st b/src/Kernel-CodeModel/VariableLayout.class.st index 5d280651009..085182f511a 100644 --- a/src/Kernel-CodeModel/VariableLayout.class.st +++ b/src/Kernel-CodeModel/VariableLayout.class.st @@ -19,6 +19,14 @@ VariableLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +VariableLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#variableSubclass: +] + { #category : 'format' } VariableLayout >> instanceSpecification [ ^ self hasFields diff --git a/src/Kernel-CodeModel/WeakLayout.class.st b/src/Kernel-CodeModel/WeakLayout.class.st index 4852331b074..02b3259136f 100644 --- a/src/Kernel-CodeModel/WeakLayout.class.st +++ b/src/Kernel-CodeModel/WeakLayout.class.st @@ -21,6 +21,14 @@ WeakLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +WeakLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#weakSubclass: +] + { #category : 'format' } WeakLayout >> instanceSpecification [ ^ 4 diff --git a/src/Kernel-CodeModel/WordLayout.class.st b/src/Kernel-CodeModel/WordLayout.class.st index 6b6f14819d4..d607cbf21ca 100644 --- a/src/Kernel-CodeModel/WordLayout.class.st +++ b/src/Kernel-CodeModel/WordLayout.class.st @@ -16,6 +16,14 @@ WordLayout class >> extending: superLayout scope: aScope host: aClass [ yourself ] +{ #category : 'description' } +WordLayout class >> subclassDefiningSymbol [ + "Answer a keyword that describes the receiver's kind of subclass + Note: this is for printing the ST80 style class definiton, usage makes no sense for anything + else!" + ^#variableWordSubclass: +] + { #category : 'accessing' } WordLayout >> bytesPerSlot [ From 047212787aa1e34a37cbac93b72467f56e95d538 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 22 Jan 2025 15:32:05 +0100 Subject: [PATCH 3/4] Move tests of ClassDefinitionPrinter to ClassDefinitionPrinters-Tests --- src/BaselineOfBasicTools/BaselineOfBasicTools.class.st | 1 + .../ClassDefinitionPrinterConfigurationTest.class.st | 5 ++--- .../CommonClassDefinitionPrinterTest.class.st | 5 ++--- .../FluidClassDefinitionPrinterTest.class.st | 5 ++--- .../LegacyClassDefinitionPrinterTest.class.st | 5 ++--- .../MockWithComplexSlot.class.st | 5 ++--- .../OldClassDefinitionPrinterTest.class.st | 5 ++--- src/ClassDefinitionPrinters-Tests/package.st | 1 + 8 files changed, 14 insertions(+), 18 deletions(-) rename src/{Kernel-Tests => ClassDefinitionPrinters-Tests}/ClassDefinitionPrinterConfigurationTest.class.st (92%) rename src/{Kernel-Tests => ClassDefinitionPrinters-Tests}/CommonClassDefinitionPrinterTest.class.st (87%) rename src/{Kernel-Tests => ClassDefinitionPrinters-Tests}/FluidClassDefinitionPrinterTest.class.st (98%) rename src/{Kernel-Tests => ClassDefinitionPrinters-Tests}/LegacyClassDefinitionPrinterTest.class.st (97%) rename src/{Kernel-Tests => ClassDefinitionPrinters-Tests}/MockWithComplexSlot.class.st (86%) rename src/{Kernel-Tests => ClassDefinitionPrinters-Tests}/OldClassDefinitionPrinterTest.class.st (97%) create mode 100644 src/ClassDefinitionPrinters-Tests/package.st diff --git a/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st b/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st index a4c35618354..3571dfdfc83 100644 --- a/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st +++ b/src/BaselineOfBasicTools/BaselineOfBasicTools.class.st @@ -74,6 +74,7 @@ BaselineOfBasicTools >> baseline: spec [ spec package: 'MonticelloGUI' with: [ spec requires: #( 'Tool-Diff' ) ]. spec package: 'System-Sources-Tests'. "<= Not sure this one should be here but it is where the classes were loaded before been extracted from Tests package." + spec package: 'ClassDefinitionPrinters-Tests'. spec package: 'Kernel-CodeModel-Tests'. spec package: 'Monticello-Tests'. spec package: 'MonticelloGUI-Tests'. diff --git a/src/Kernel-Tests/ClassDefinitionPrinterConfigurationTest.class.st b/src/ClassDefinitionPrinters-Tests/ClassDefinitionPrinterConfigurationTest.class.st similarity index 92% rename from src/Kernel-Tests/ClassDefinitionPrinterConfigurationTest.class.st rename to src/ClassDefinitionPrinters-Tests/ClassDefinitionPrinterConfigurationTest.class.st index 690c28592ec..91b5c2bc438 100644 --- a/src/Kernel-Tests/ClassDefinitionPrinterConfigurationTest.class.st +++ b/src/ClassDefinitionPrinters-Tests/ClassDefinitionPrinterConfigurationTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'ClassDefinitionPrinterConfigurationTest', #superclass : 'CommonClassDefinitionPrinterTest', - #category : 'Kernel-Tests-Fluid', - #package : 'Kernel-Tests', - #tag : 'Fluid' + #category : 'ClassDefinitionPrinters-Tests', + #package : 'ClassDefinitionPrinters-Tests' } { #category : 'tests' } diff --git a/src/Kernel-Tests/CommonClassDefinitionPrinterTest.class.st b/src/ClassDefinitionPrinters-Tests/CommonClassDefinitionPrinterTest.class.st similarity index 87% rename from src/Kernel-Tests/CommonClassDefinitionPrinterTest.class.st rename to src/ClassDefinitionPrinters-Tests/CommonClassDefinitionPrinterTest.class.st index 734b243c4c6..9d0055c1556 100644 --- a/src/Kernel-Tests/CommonClassDefinitionPrinterTest.class.st +++ b/src/ClassDefinitionPrinters-Tests/CommonClassDefinitionPrinterTest.class.st @@ -8,9 +8,8 @@ Class { #instVars : [ 'slotDisplay' ], - #category : 'Kernel-Tests-Fluid', - #package : 'Kernel-Tests', - #tag : 'Fluid' + #category : 'ClassDefinitionPrinters-Tests', + #package : 'ClassDefinitionPrinters-Tests' } { #category : 'running' } diff --git a/src/Kernel-Tests/FluidClassDefinitionPrinterTest.class.st b/src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st similarity index 98% rename from src/Kernel-Tests/FluidClassDefinitionPrinterTest.class.st rename to src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st index c29f23d5681..259b5a692e4 100644 --- a/src/Kernel-Tests/FluidClassDefinitionPrinterTest.class.st +++ b/src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'FluidClassDefinitionPrinterTest', #superclass : 'CommonClassDefinitionPrinterTest', - #category : 'Kernel-Tests-Fluid', - #package : 'Kernel-Tests', - #tag : 'Fluid' + #category : 'ClassDefinitionPrinters-Tests', + #package : 'ClassDefinitionPrinters-Tests' } { #category : 'helpers' } diff --git a/src/Kernel-Tests/LegacyClassDefinitionPrinterTest.class.st b/src/ClassDefinitionPrinters-Tests/LegacyClassDefinitionPrinterTest.class.st similarity index 97% rename from src/Kernel-Tests/LegacyClassDefinitionPrinterTest.class.st rename to src/ClassDefinitionPrinters-Tests/LegacyClassDefinitionPrinterTest.class.st index d189ee68d17..fbc510eea39 100644 --- a/src/Kernel-Tests/LegacyClassDefinitionPrinterTest.class.st +++ b/src/ClassDefinitionPrinters-Tests/LegacyClassDefinitionPrinterTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'LegacyClassDefinitionPrinterTest', #superclass : 'CommonClassDefinitionPrinterTest', - #category : 'Kernel-Tests-Fluid', - #package : 'Kernel-Tests', - #tag : 'Fluid' + #category : 'ClassDefinitionPrinters-Tests', + #package : 'ClassDefinitionPrinters-Tests' } { #category : 'helpers' } diff --git a/src/Kernel-Tests/MockWithComplexSlot.class.st b/src/ClassDefinitionPrinters-Tests/MockWithComplexSlot.class.st similarity index 86% rename from src/Kernel-Tests/MockWithComplexSlot.class.st rename to src/ClassDefinitionPrinters-Tests/MockWithComplexSlot.class.st index 68bb728a8ac..dc36b306890 100644 --- a/src/Kernel-Tests/MockWithComplexSlot.class.st +++ b/src/ClassDefinitionPrinters-Tests/MockWithComplexSlot.class.st @@ -9,9 +9,8 @@ Class { #instVars : [ '#aComplexSlot => ObservableSlot' ], - #category : 'Kernel-Tests-Fluid', - #package : 'Kernel-Tests', - #tag : 'Fluid' + #category : 'ClassDefinitionPrinters-Tests', + #package : 'ClassDefinitionPrinters-Tests' } { #category : 'initialization' } diff --git a/src/Kernel-Tests/OldClassDefinitionPrinterTest.class.st b/src/ClassDefinitionPrinters-Tests/OldClassDefinitionPrinterTest.class.st similarity index 97% rename from src/Kernel-Tests/OldClassDefinitionPrinterTest.class.st rename to src/ClassDefinitionPrinters-Tests/OldClassDefinitionPrinterTest.class.st index 03da746c589..f3906e5dd54 100644 --- a/src/Kernel-Tests/OldClassDefinitionPrinterTest.class.st +++ b/src/ClassDefinitionPrinters-Tests/OldClassDefinitionPrinterTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'OldClassDefinitionPrinterTest', #superclass : 'CommonClassDefinitionPrinterTest', - #category : 'Kernel-Tests-Fluid', - #package : 'Kernel-Tests', - #tag : 'Fluid' + #category : 'ClassDefinitionPrinters-Tests', + #package : 'ClassDefinitionPrinters-Tests' } { #category : 'tests - expanded' } diff --git a/src/ClassDefinitionPrinters-Tests/package.st b/src/ClassDefinitionPrinters-Tests/package.st new file mode 100644 index 00000000000..e8826eab0ab --- /dev/null +++ b/src/ClassDefinitionPrinters-Tests/package.st @@ -0,0 +1 @@ +Package { #name : 'ClassDefinitionPrinters-Tests' } From 011880b21627fe0761ae86332296abecae90b941 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 28 Jan 2025 15:04:13 +0100 Subject: [PATCH 4/4] Fix test --- .../FluidClassDefinitionPrinterTest.class.st | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st b/src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st index 259b5a692e4..a89fe7f51bd 100644 --- a/src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st +++ b/src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st @@ -82,8 +82,7 @@ FluidClassDefinitionPrinterTest >> testDefinitionWithComplexSlot [ self assert: (self forClass: MockWithComplexSlot) equals: 'Object << #MockWithComplexSlot slots: { #aComplexSlot => ObservableSlot }; - tag: ''Fluid''; - package: ''Kernel-Tests''' + package: ''ClassDefinitionPrinters-Tests''' ] { #category : 'tests - unnecessary values' }