Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Commit

Permalink
Adapt to changes in latest months of Spec2
Browse files Browse the repository at this point in the history 
Some methods were transformed automatically by
deprecation rules of Spec2
  • Loading branch information
@tinchodias
tinchodias committed May 10, 2022
1 parent 03676c1 commit aa628e9
Show file tree
Hide file tree
Showing 20 changed files with 200 additions and 152 deletions.
8 changes: 4 additions & 4 deletions src/Spec-Brick-Examples-ToDoList/SpToDoListPresenter.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ app := SpApplication new
model := SpToDoList exampleWithSomeTasks.
presenter := SpToDoListPresenter newApplication: app model: model.
presenter openWithSpec.
presenter open.
```
"
Class {
Expand All @@ -32,8 +32,8 @@ Class {
#category : #'Spec-Brick-Examples-ToDoList-Presenters'
}

{ #category : #specs }
SpToDoListPresenter class >> defaultSpec [
{ #category : #layout }
SpToDoListPresenter class >> defaultLayout [

^ SpBoxLayout newTopToBottom
borderWidth: 5;
Expand Down Expand Up @@ -187,7 +187,7 @@ SpToDoListPresenter >> openAddTaskDialog [

(SpToDoTaskDialog newApplication: self application model: toDoList)
parentWindow: self window;
openDialogWithSpec
openDialog
]

{ #category : #private }
Expand Down
28 changes: 15 additions & 13 deletions src/Spec-Brick-Examples-ToDoList/SpToDoTaskDialog.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Class {
#category : #'Spec-Brick-Examples-ToDoList-Presenters'
}

{ #category : #specs }
SpToDoTaskDialog class >> defaultSpec [
{ #category : #layout }
SpToDoTaskDialog class >> defaultLayout [

^ SpBoxLayout newVertical
borderWidth: 5;
Expand Down Expand Up @@ -70,16 +70,19 @@ SpToDoTaskDialog >> initializePresenter [


priorityLabel := self newLabel
label: 'Priority:';
yourself.
label: 'Priority:';
yourself.

priorityDropList := self newDropList
" display: [ :item | item name ];"
display: [ :item | item ifNil: [ '-- none ---' ] ifNotNil: [ item name ] ];
iconBlock: [ :item | self iconNamed: #empty ];
items: SpToDoTaskPriority allPredefined;
selectIndex: 1;
yourself.
display: [ :item |
item
ifNil: [ '-- none ---' ]
ifNotNil: [ item name ] ];
displayIcon: [ :item | self iconNamed: #empty ];
items: SpToDoTaskPriority allPredefined;
selectIndex: 1;
yourself.
" display: [ :item | item name ];"


descriptionLabel := self newLabel
Expand All @@ -97,11 +100,10 @@ SpToDoTaskDialog >> setModelBeforeInitialization: aSpToDoList [

{ #category : #actions }
SpToDoTaskDialog >> showError: error [

self application newInform
title: 'Validation Error';
label: error messageText;
parentWindow: self window;
openDialogWithSpec

openDialog
]
117 changes: 69 additions & 48 deletions src/Spec-Brick-Tests/SpBrickBoxLayoutTest.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,71 +21,87 @@ SpBrickBoxLayoutTest >> testHorizontalPadding [

| presenter labelPaddings |
presenter := self newApplication new: SpPresenter.

presenter layout: (SpBoxLayout newLeftToRight
add: presenter newLabel expand: false fill: false padding: 11;
add: presenter newLabel expand: false fill: false padding: 22;
yourself).

presenter buildWithSpec.
presenter layout: (SpBoxLayout newLeftToRight
add: presenter newLabel
expand: false
fill: false
padding: 11;
add: presenter newLabel
expand: false
fill: false
padding: 22;
yourself).

presenter build.
self waitBlocSpace.

labelPaddings := presenter adapter widget withAllChildrenBreadthFirst
select: [ :each | each isKindOf: BrLabel ]
thenCollect: [ :each | each padding ].
select: [ :each | each isKindOf: BrLabel ]
thenCollect: [ :each | each padding ].

presenter window ifNotNil: [ :w | w close ].

self assert: labelPaddings first equals: (BlInsets horizontal: 11).
self assert: labelPaddings second equals: (BlInsets horizontal: 22).

self assert: labelPaddings first equals: (BlInsets horizontal: 11).
self assert: labelPaddings second equals: (BlInsets horizontal: 22)
]

{ #category : #tests }
SpBrickBoxLayoutTest >> testMixAddWithAddLast: aSpBoxLayout [

| presenter labelA labelB labelC labelD labelTexts |
presenter := self newApplication new: SpPresenter.

aSpBoxLayout
add: (labelA := presenter newLabel label: 'A'; yourself);
addLast: (labelC := presenter newLabel label: 'C'; yourself);
add: (labelB := presenter newLabel label: 'B'; yourself);
addLast: (labelD := presenter newLabel label: 'D'; yourself).

add: (labelA := presenter newLabel
label: 'A';
yourself);
addLast: (labelC := presenter newLabel
label: 'C';
yourself);
add: (labelB := presenter newLabel
label: 'B';
yourself);
addLast: (labelD := presenter newLabel
label: 'D';
yourself).

presenter
layout: aSpBoxLayout;
buildWithSpec.
build.

labelTexts := presenter adapter widget withAllChildrenBreadthFirst
select: [ :each | each isKindOf: BlAttributedTextElement ]
thenCollect: [ :each | each text asString ].

select: [ :each |
each isKindOf: BlAttributedTextElement ]
thenCollect: [ :each | each text asString ].

presenter window ifNotNil: [ :w | w close ].

self assert: labelTexts equals: #(A B C D).

self assert: labelTexts equals: #( A B C D )
]

{ #category : #tests }
SpBrickBoxLayoutTest >> testSpacing [

| presenter spacing |
presenter := self newApplication new: SpPresenter.

spacing := 17.

presenter layout: (SpBoxLayout newHorizontal
spacing: spacing;
add: presenter newLabel;
addLast: presenter newLabel;
yourself).

presenter buildWithSpec.

self assert: presenter adapter startPane layout cellSpacing equals: spacing.
self assert: presenter adapter endPane layout cellSpacing equals: spacing.
spacing := 17.

presenter layout: (SpBoxLayout newHorizontal
spacing: spacing;
add: presenter newLabel;
addLast: presenter newLabel;
yourself).

presenter build.

self
assert: presenter adapter startPane layout cellSpacing
equals: spacing.
self
assert: presenter adapter endPane layout cellSpacing
equals: spacing
]

{ #category : #tests }
Expand All @@ -99,21 +115,26 @@ SpBrickBoxLayoutTest >> testVerticalPadding [

| presenter labelPaddings |
presenter := self newApplication new: SpPresenter.

presenter layout: (SpBoxLayout newTopToBottom
add: presenter newLabel expand: false fill: false padding: 11;
add: presenter newLabel expand: false fill: false padding: 22;
yourself).

presenter buildWithSpec.
presenter layout: (SpBoxLayout newTopToBottom
add: presenter newLabel
expand: false
fill: false
padding: 11;
add: presenter newLabel
expand: false
fill: false
padding: 22;
yourself).

presenter build.

labelPaddings := presenter adapter widget withAllChildrenBreadthFirst
select: [ :each | each isKindOf: BrLabel ]
thenCollect: [ :each | each padding ].
select: [ :each | each isKindOf: BrLabel ]
thenCollect: [ :each | each padding ].

presenter withWindowDo: [ :w | w close ].

self assert: labelPaddings first equals: (BlInsets vertical: 11).
self assert: labelPaddings second equals: (BlInsets vertical: 22).

self assert: labelPaddings first equals: (BlInsets vertical: 11).
self assert: labelPaddings second equals: (BlInsets vertical: 22)
]
7 changes: 3 additions & 4 deletions src/Spec-Brick-Tests/SpBrickButtonBarAdapterTest.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ SpBrickButtonBarAdapterTest >> setUpSpecWidgetClass: aPresenterClass blockToSetU

specWidget := self newApplication new: aPresenterClass.
aBlock value.
specWindow := specWidget openWithSpec.

brickWidget := specWidget adapter widget.
brickWindow := specWindow adapter widget.
specWindow := specWidget open.

brickWidget := specWidget adapter widget.
brickWindow := specWindow adapter widget
]

{ #category : #running }
Expand Down
4 changes: 2 additions & 2 deletions src/Spec-Brick-Tests/SpBrickDialogWindowAdapterTest.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Class {
{ #category : #hook }
SpBrickDialogWindowAdapterTest >> openSpecWindow [

specWindow := specContent openDialogWithSpec.
specWindow := specContent openDialog.
brickWindow := specWindow adapter widget
]

Expand All @@ -27,7 +27,7 @@ SpBrickDialogWindowAdapterTest >> testParentWindow [
aSpWindow
initialPosition: 200 @ 100;
initialExtent: 400 @ 300 ];
openWithSpec.
open.
self waitBlocSpace.

specContent parentWindow: referenceWindow.
Expand Down
4 changes: 1 addition & 3 deletions src/Spec-Brick-Tests/SpBrickDirectionableLayoutTest.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SpBrickDirectionableLayoutTest >> testAddTwoLabelsInCorrectOrderWith: aSpDirecti

presenter
layout: aSpDirectionableLayout;
buildWithSpec.
build.

labelTexts := presenter adapter widget withAllChildrenBreadthFirst
select: [ :each | each isKindOf: BlAttributedTextElement ]
Expand All @@ -40,8 +40,6 @@ SpBrickDirectionableLayoutTest >> testAddTwoLabelsInCorrectOrderWith: aSpDirecti
] ensure: [
presenter window ifNotNil: [ :w | w close ] ]



]

{ #category : #tests }
Expand Down
57 changes: 23 additions & 34 deletions src/Spec-Brick-Tests/SpBrickPanedLayoutTest.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,78 +15,67 @@ SpBrickPanedLayoutTest >> testHorizontal [

| aSpDirectionableLayout presenter labelA labelB elements |
presenter := self newApplication new: SpPresenter.

aSpDirectionableLayout := self layoutClass newHorizontal
add: (labelA := presenter newLabel);
add: (labelB := presenter newLabel);
yourself.
add: (labelA := presenter newLabel);
add: (labelB := presenter newLabel);
yourself.

presenter
layout: aSpDirectionableLayout;
buildWithSpec.
build.

elements := presenter adapter widget children.
self
assert: elements first
equals: labelA adapter widget.
self
assert: elements third
equals: labelB adapter widget.
self assert: elements first equals: labelA adapter widget.
self assert: elements third equals: labelB adapter widget.
self
assert: elements second class
equals: SpBrickHorizontalResizerElement.

equals: SpBrickHorizontalResizerElement
]

{ #category : #tests }
SpBrickPanedLayoutTest >> testPositionOfSlider [

| aSpDirectionableLayout presenter labelA labelB |
presenter := self newApplication new: SpPresenter.

aSpDirectionableLayout := self layoutClass newHorizontal
positionOfSlider: 0.75;
add: (labelA := presenter newLabel);
add: (labelB := presenter newLabel);
yourself.
positionOfSlider: 0.75;
add: (labelA := presenter newLabel);
add: (labelB := presenter newLabel);
yourself.

presenter
layout: aSpDirectionableLayout;
buildWithSpec.
build.

self
assert: labelA adapter widget constraints linear weight
equals: 0.75.
self
assert: labelB adapter widget constraints linear weight
equals: 0.25.

equals: 0.25
]

{ #category : #tests }
SpBrickPanedLayoutTest >> testVertical [

| aSpDirectionableLayout presenter labelA labelB elements |
presenter := self newApplication new: SpPresenter.

aSpDirectionableLayout := self layoutClass newVertical
add: (labelA := presenter newLabel);
add: (labelB := presenter newLabel);
yourself.
add: (labelA := presenter newLabel);
add: (labelB := presenter newLabel);
yourself.

presenter
layout: aSpDirectionableLayout;
buildWithSpec.
build.

elements := presenter adapter widget children.
self
assert: elements first
equals: labelA adapter widget.
self
assert: elements third
equals: labelB adapter widget.
self assert: elements first equals: labelA adapter widget.
self assert: elements third equals: labelB adapter widget.
self
assert: elements second class
equals: SpBrickVerticalResizerElement.

equals: SpBrickVerticalResizerElement
]
Loading

0 comments on commit aa628e9

Please sign in to comment.