Skip to content

Commit

Permalink
Merge pull request #1461 from demarey/tonelv3
Browse files Browse the repository at this point in the history
move to tonel v3
  • Loading branch information
jecisc authored Oct 11, 2023
2 parents 13b84fb + bbe963c commit 9441b4b
Show file tree
Hide file tree
Showing 881 changed files with 12,103 additions and 7,221 deletions.
19 changes: 10 additions & 9 deletions src/BaselineOfSpec2/BaselineOfSpec2.class.st
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #BaselineOfSpec2,
#superclass : #BaselineOf,
#category : #BaselineOfSpec2
#name : 'BaselineOfSpec2',
#superclass : 'BaselineOf',
#category : 'BaselineOfSpec2',
#package : 'BaselineOfSpec2'
}

{ #category : #baseline }
{ #category : 'baseline' }
BaselineOfSpec2 >> baseline: spec [
<baseline>

Expand Down Expand Up @@ -49,7 +50,7 @@ BaselineOfSpec2 >> baseline: spec [
spec group: 'default' with: #('Base' 'Tests' 'Code' 'CodeTests').
]

{ #category : #'external projects' }
{ #category : 'external projects' }
BaselineOfSpec2 >> defaultRepositoryURL [

^ self class environment
Expand All @@ -58,7 +59,7 @@ BaselineOfSpec2 >> defaultRepositoryURL [
ifAbsent: [ 'github://pharo-spec/Spec' ]
]

{ #category : #'external projects' }
{ #category : 'external projects' }
BaselineOfSpec2 >> packageRepository [

" Tries to determine a repository from which the baseline is being loaded. Useful for
Expand All @@ -73,7 +74,7 @@ BaselineOfSpec2 >> packageRepository [
ifEmpty: [ nil ]
]

{ #category : #accessing }
{ #category : 'accessing' }
BaselineOfSpec2 >> project [
"Atomic loading is needed for Spec because we are moving classes of package and it breaks their subclasses.
Expand All @@ -99,7 +100,7 @@ We need to use atomic loading only during update of existing Spec upgrade"

]

{ #category : #'external projects' }
{ #category : 'external projects' }
BaselineOfSpec2 >> specCore: spec [

spec baseline: 'SpecCore' with: [
Expand All @@ -108,7 +109,7 @@ BaselineOfSpec2 >> specCore: spec [
loads: #('Base' 'Tests') ]
]

{ #category : #'external projects' }
{ #category : 'external projects' }
BaselineOfSpec2 >> specCoreCode: spec [

spec baseline: 'SpecCoreCode' with: [
Expand Down
2 changes: 1 addition & 1 deletion src/BaselineOfSpec2/package.st
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Package { #name : #BaselineOfSpec2 }
Package { #name : 'BaselineOfSpec2' }
13 changes: 7 additions & 6 deletions src/BaselineOfSpecCore/BaselineOfSpecCore.class.st
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #BaselineOfSpecCore,
#superclass : #BaselineOf,
#category : #BaselineOfSpecCore
#name : 'BaselineOfSpecCore',
#superclass : 'BaselineOf',
#category : 'BaselineOfSpecCore',
#package : 'BaselineOfSpecCore'
}

{ #category : #baseline }
{ #category : 'baseline' }
BaselineOfSpecCore >> baseline: spec [
<baseline>

Expand Down Expand Up @@ -64,14 +65,14 @@ BaselineOfSpecCore >> baseline: spec [
spec group: 'default' with: #('Base' 'BaseTests' 'Code' 'CodeTests').
]

{ #category : #'external projects' }
{ #category : 'external projects' }
BaselineOfSpecCore >> pillar: spec [
spec
baseline: 'PillarCore'
with: [ spec repository: 'github://pillar-markup/pillar:dev-8/src' ]
]

{ #category : #accessing }
{ #category : 'accessing' }
BaselineOfSpecCore >> project [
"Atomic loading is needed for Spec because we are moving classes of package and it breaks their subclasses.
Expand Down
2 changes: 1 addition & 1 deletion src/BaselineOfSpecCore/package.st
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Package { #name : #BaselineOfSpecCore }
Package { #name : 'BaselineOfSpecCore' }
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #SpApplicationTest }
Extension { #name : 'SpApplicationTest' }

{ #category : #'*Spec2-Adapters-Morphic-Tests' }
{ #category : '*Spec2-Adapters-Morphic-Tests' }
SpApplicationTest >> testAdapterBindings [

self assert: application adapterBindings class equals: SpStubAdapterBindings.
Expand Down
9 changes: 5 additions & 4 deletions src/Spec2-Adapters-Morphic-Tests/SpDrawStyleTest.class.st
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #SpDrawStyleTest,
#superclass : #TestCase,
#category : #'Spec2-Adapters-Morphic-Tests'
#name : 'SpDrawStyleTest',
#superclass : 'TestCase',
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #tests }
{ #category : 'tests' }
SpDrawStyleTest >> testToColor [
| style |

Expand Down
9 changes: 5 additions & 4 deletions src/Spec2-Adapters-Morphic-Tests/SpFontStyleTest.class.st
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #SpFontStyleTest,
#superclass : #TestCase,
#category : #'Spec2-Adapters-Morphic-Tests'
#name : 'SpFontStyleTest',
#superclass : 'TestCase',
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #tests }
{ #category : 'tests' }
SpFontStyleTest >> testResetFont [

| styleSheet app presenter font |
Expand Down
19 changes: 10 additions & 9 deletions src/Spec2-Adapters-Morphic-Tests/SpMergeStyleTest.class.st
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Class {
#name : #SpMergeStyleTest,
#superclass : #TestCase,
#name : 'SpMergeStyleTest',
#superclass : 'TestCase',
#instVars : [
'result',
'left',
'right'
],
#category : #'Spec2-Adapters-Morphic-Tests'
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #running }
{ #category : 'running' }
SpMergeStyleTest >> setUp [

super setUp.
Expand All @@ -32,7 +33,7 @@ SpMergeStyleTest >> setUp [

]

{ #category : #tests }
{ #category : 'tests' }
SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasClassInBothSides [

result := (left mergeWith: right) flattenClasses.
Expand All @@ -42,7 +43,7 @@ SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasClassInBothSides [

]

{ #category : #tests }
{ #category : 'tests' }
SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasCorrectNumberOfEntries [

result := (left mergeWith: right) flattenClasses.
Expand All @@ -51,7 +52,7 @@ SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasCorrectNumberOfEntries

]

{ #category : #tests }
{ #category : 'tests' }
SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasLeftOnlyClass [

result := (left mergeWith: right) flattenClasses.
Expand All @@ -60,7 +61,7 @@ SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasLeftOnlyClass [

]

{ #category : #tests }
{ #category : 'tests' }
SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasRightOnlyClass [

result := (left mergeWith: right) flattenClasses.
Expand All @@ -69,7 +70,7 @@ SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasRightOnlyClass [

]

{ #category : #tests }
{ #category : 'tests' }
SpMergeStyleTest >> testMergingTwoStylesWithASameClassHasThePropertiesCorrectInCommonClass [

| innerClass |
Expand Down
23 changes: 12 additions & 11 deletions src/Spec2-Adapters-Morphic-Tests/SpMorphStyleTest.class.st
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
Class {
#name : #SpMorphStyleTest,
#superclass : #TestCase,
#category : #'Spec2-Adapters-Morphic-Tests'
#name : 'SpMorphStyleTest',
#superclass : 'TestCase',
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #private }
{ #category : 'private' }
SpMorphStyleTest >> newLookup: aString [
| rootClass |

rootClass := SpStyleSTONReader fromString: aString.
^ SpMorphStyle newStyles: rootClass flattenClasses
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testApplyTo [
| styleResolver morph |

Expand All @@ -34,7 +35,7 @@ SpMorphStyleTest >> testApplyTo [
self assert: morph width equals: 42
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testDeepLookup [
"This should answer the deepest width"
| styleResolver |
Expand All @@ -52,7 +53,7 @@ SpMorphStyleTest >> testDeepLookup [
self assert: styleResolver width equals: 42
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testDeepMultipleLookup [
"This should answer the deepest width (last appearence)"
| styleResolver |
Expand All @@ -73,7 +74,7 @@ SpMorphStyleTest >> testDeepMultipleLookup [
self assert: styleResolver width equals: 42
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testFromStylesheetAdapter [

| lookup labelAdapter |
Expand Down Expand Up @@ -117,7 +118,7 @@ SpMorphStyleTest >> testFromStylesheetAdapter [
adapter: labelAdapter
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testNestedStyles [

| lookup labelAdapter styleSheet |
Expand Down Expand Up @@ -160,7 +161,7 @@ SpMorphStyleTest >> testNestedStyles [
self assert: lookup width equals: 84
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testSimpleLookup [
"this should answer the width defined in the only level"
| styleResolver |
Expand All @@ -172,7 +173,7 @@ SpMorphStyleTest >> testSimpleLookup [
self assert: styleResolver width equals: 42
]

{ #category : #tests }
{ #category : 'tests' }
SpMorphStyleTest >> testTwoClassWithSameName [

| morphStyle style1 style2 property label |
Expand Down
15 changes: 8 additions & 7 deletions src/Spec2-Adapters-Morphic-Tests/SpPropertyStyleTest.class.st
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #SpPropertyStyleTest,
#superclass : #TestCase,
#category : #'Spec2-Adapters-Morphic-Tests'
#name : 'SpPropertyStyleTest',
#superclass : 'TestCase',
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #tests }
{ #category : 'tests' }
SpPropertyStyleTest >> testMergeWith [
| p1 p2 p3 |

Expand All @@ -23,7 +24,7 @@ SpPropertyStyleTest >> testMergeWith [
self assert: p3 height equals: 40
]

{ #category : #tests }
{ #category : 'tests' }
SpPropertyStyleTest >> testMergeWithFontDoNotRemovePredefinedFontWhenNoFontIsDefined [
| p1 p2 p3 |

Expand All @@ -41,7 +42,7 @@ SpPropertyStyleTest >> testMergeWithFontDoNotRemovePredefinedFontWhenNoFontIsDef
self assert: p3 color equals: Color white
]

{ #category : #tests }
{ #category : 'tests' }
SpPropertyStyleTest >> testMergeWithFontRemovePredefinedFont [
| p1 p2 p3 |

Expand All @@ -59,7 +60,7 @@ SpPropertyStyleTest >> testMergeWithFontRemovePredefinedFont [

]

{ #category : #tests }
{ #category : 'tests' }
SpPropertyStyleTest >> testMergeWithPredefinedFontCanBeDecorated [
| p1 p2 p3 |

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Class {
#name : #SpStyleEnvironmentColorProxyTest,
#superclass : #TestCase,
#category : #'Spec2-Adapters-Morphic-Tests'
#name : 'SpStyleEnvironmentColorProxyTest',
#superclass : 'TestCase',
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #tests }
{ #category : 'tests' }
SpStyleEnvironmentColorProxyTest >> testSerializationWithFuelMaintainProxy [

| proxy byteArray deserialized |
Expand Down
11 changes: 6 additions & 5 deletions src/Spec2-Adapters-Morphic-Tests/SpStyleTest.class.st
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
Class {
#name : #SpStyleTest,
#superclass : #TestCase,
#name : 'SpStyleTest',
#superclass : 'TestCase',
#instVars : [
'aClass'
],
#category : #'Spec2-Adapters-Morphic-Tests'
#category : 'Spec2-Adapters-Morphic-Tests',
#package : 'Spec2-Adapters-Morphic-Tests'
}

{ #category : #running }
{ #category : 'running' }
SpStyleTest >> tearDown [

aClass ifNotNil: [ :e | e removeFromSystem ].
super tearDown
]

{ #category : #tests }
{ #category : 'tests' }
SpStyleTest >> testParsingAStyleIsNotAffectedByExistingClass [

| aStylesheet |
Expand Down
Loading

0 comments on commit 9441b4b

Please sign in to comment.