From 98c4857ca0e41f350dc6032b1fb4aaf30e169691 Mon Sep 17 00:00:00 2001 From: Alicia Cabrejas Leonhardt Date: Sun, 7 Jul 2024 18:32:55 +0200 Subject: [PATCH 1/2] tests like style guide --- .../WBButtonTests.class.st | 4 +- .../WBCanvasTests.class.st | 11 +- .../WBDeletePopUpTests.class.st | 38 ++--- .../WBElementLineTests.class.st | 4 +- .../WBElementPopUpTests.class.st | 50 +++--- .../WBElementResizeTests.class.st | 152 +++++++++--------- .../WBElementTests.class.st | 3 +- .../WBGlobalColorPopUpTests.class.st | 54 +++---- .../WBLineChoosingPopUpTests.class.st | 26 +-- .../WBShapeChoosingPopUpTests.class.st | 24 +-- .../WBToolbarButtonTests.class.st | 9 +- 11 files changed, 193 insertions(+), 182 deletions(-) diff --git a/src/SqueakWhiteboard-Tests/WBButtonTests.class.st b/src/SqueakWhiteboard-Tests/WBButtonTests.class.st index 3dba368..561987a 100644 --- a/src/SqueakWhiteboard-Tests/WBButtonTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBButtonTests.class.st @@ -98,14 +98,14 @@ WBButtonTests >> testButtonHoverColor [ { #category : #testing, - #'squeak_changestamp' : 'is 6/26/2024 10:42' + #'squeak_changestamp' : 'ACL 7/7/2024 18:19' } WBButtonTests >> testMouseDown [ | aButton aMouseEvent | aButton := self canvas toolbar buttons at: 1. aMouseEvent := MouseButtonEvent new. - aMouseEvent setType: #mouseDown position: (aButton position + aButton extent + (1@1)) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0. + aMouseEvent setType: #mouseDown position: (aButton position + aButton extent + (1 @ 1)) which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0. self assert: (aButton handlesMouseOver: aMouseEvent) = true. self assert: (aButton handlesMouseDown: aMouseEvent) = true. diff --git a/src/SqueakWhiteboard-Tests/WBCanvasTests.class.st b/src/SqueakWhiteboard-Tests/WBCanvasTests.class.st index fd8babf..27ac575 100644 --- a/src/SqueakWhiteboard-Tests/WBCanvasTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBCanvasTests.class.st @@ -48,7 +48,7 @@ WBCanvasTests >> tearDown [ { #category : #testing, - #'squeak_changestamp' : 'is 6/21/2024 20:36' + #'squeak_changestamp' : 'ACL 7/7/2024 18:26' } WBCanvasTests >> testActiveElement [ | anActiveElement aMouseEvent | @@ -57,6 +57,7 @@ WBCanvasTests >> testActiveElement [ aMouseEvent := MouseButtonEvent new. aMouseEvent setType: #mouseDown position: anActiveElement position which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0. anActiveElement mouseDown: aMouseEvent. + self assert: self canvas activeElement = anActiveElement ] @@ -81,17 +82,20 @@ WBCanvasTests >> testClampElementToCanvas [ { #category : #testing, - #'squeak_changestamp' : 'is 6/21/2024 18:50' + #'squeak_changestamp' : 'ACL 7/7/2024 18:25' } WBCanvasTests >> testElementsCollection [ | elementToDelete | self assert: self canvas elements size = 0. + self canvas addElement: (WBRectangle newWithCanvas: self canvas). self assert: self canvas elements size = 1. + elementToDelete := WBRectangle newWithCanvas: self canvas. self canvas addElement: elementToDelete. self assert: self canvas elements size = 2. + elementToDelete delete. self assert: self canvas elements size = 1 @@ -115,11 +119,12 @@ WBCanvasTests >> testMouseDown [ { #category : #testing, - #'squeak_changestamp' : 'is 6/21/2024 18:54' + #'squeak_changestamp' : 'ACL 7/7/2024 18:25' } WBCanvasTests >> testRectangleCreate [ |rectangle| rectangle := WBRectangle newWithCanvas: self canvas. + self assert: rectangle class = WBRectangle ] diff --git a/src/SqueakWhiteboard-Tests/WBDeletePopUpTests.class.st b/src/SqueakWhiteboard-Tests/WBDeletePopUpTests.class.st index e2b991a..8c7e891 100644 --- a/src/SqueakWhiteboard-Tests/WBDeletePopUpTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBDeletePopUpTests.class.st @@ -6,7 +6,7 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:36' + #'squeak_changestamp' : 'ACL 7/7/2024 18:26' } WBDeletePopUpTests >> testButtonFunctionalityForCancel [ | button buttonForCancel mouseEvent | @@ -14,15 +14,16 @@ WBDeletePopUpTests >> testButtonFunctionalityForCancel [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. button := self canvas toolbar buttons at: 6. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (200@200)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (200 @ 200)). self canvas dropElement: mouseEvent. buttonForCancel := self canvas toolbar popUp submorphs at: 1. - buttonForCancel clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForCancel clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). + self assert: self canvas elements size = 2. self assert: self canvas toolbar popUp = nil. self assert: self canvas text = nil @@ -30,7 +31,7 @@ WBDeletePopUpTests >> testButtonFunctionalityForCancel [ { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:37' + #'squeak_changestamp' : 'ACL 7/7/2024 18:26' } WBDeletePopUpTests >> testButtonFunctionalityForConfirm [ | button buttonForConfirm mouseEvent | @@ -39,15 +40,16 @@ WBDeletePopUpTests >> testButtonFunctionalityForConfirm [ mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. button := self canvas toolbar buttons at: 6. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (200@200)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (200 @ 200)). self canvas dropElement: mouseEvent. buttonForConfirm := self canvas toolbar popUp submorphs at: 2. - buttonForConfirm clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForConfirm clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). + self assert: self canvas elements size = 0. self assert: self canvas toolbar popUp = nil. self assert: self canvas text = nil @@ -55,26 +57,26 @@ WBDeletePopUpTests >> testButtonFunctionalityForConfirm [ { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:33' + #'squeak_changestamp' : 'ACL 7/7/2024 18:21' } WBDeletePopUpTests >> testButtonsOfPopUp [ | button | button := self canvas toolbar buttons at: 6. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp submorphs size = 2 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:33' + #'squeak_changestamp' : 'ACL 7/7/2024 18:21' } WBDeletePopUpTests >> testExistenceOfPopUp [ | button| button := self canvas toolbar buttons at: 6. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp notNil. self assert: self canvas text contents = WBToolbar textForDeleteAll @@ -82,13 +84,13 @@ WBDeletePopUpTests >> testExistenceOfPopUp [ { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:33' + #'squeak_changestamp' : 'ACL 7/7/2024 18:21' } WBDeletePopUpTests >> testPopUpPlacementInX [ | button | button := self canvas toolbar buttons at: 6. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: (self canvas center x - 100) <= self canvas toolbar popUp left. self assert: self canvas toolbar popUp right <= (self canvas center x + 100) @@ -96,13 +98,13 @@ WBDeletePopUpTests >> testPopUpPlacementInX [ { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:33' + #'squeak_changestamp' : 'ACL 7/7/2024 18:21' } WBDeletePopUpTests >> testPopUpPlacementInY [ | button | button := self canvas toolbar buttons at: 6. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas center y <= self canvas toolbar popUp top. self assert: self canvas toolbar popUp bottom <= (self canvas bottom) diff --git a/src/SqueakWhiteboard-Tests/WBElementLineTests.class.st b/src/SqueakWhiteboard-Tests/WBElementLineTests.class.st index 675a2f3..b05e36a 100644 --- a/src/SqueakWhiteboard-Tests/WBElementLineTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBElementLineTests.class.st @@ -6,7 +6,7 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:36' + #'squeak_changestamp' : 'ACL 7/7/2024 18:27' } WBElementLineTests >> testSpawningViaClicking [ | element mouseEvent1 mouseEvent2 | @@ -17,7 +17,7 @@ WBElementLineTests >> testSpawningViaClicking [ mouseEvent2 setType: #mouseDown position: self canvas position + (200 @ 200) which: 4 buttons: mouseEvent2 class redButton hand: HandMorph new stamp: 0. element := ((WBLine newWithCanvas: self canvas) arrowHead: true). - self canvas spawnAnElement: (element) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (element) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). element mouseUp: mouseEvent1. element mouseUp: mouseEvent2. diff --git a/src/SqueakWhiteboard-Tests/WBElementPopUpTests.class.st b/src/SqueakWhiteboard-Tests/WBElementPopUpTests.class.st index 59a6847..8783735 100644 --- a/src/SqueakWhiteboard-Tests/WBElementPopUpTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBElementPopUpTests.class.st @@ -6,7 +6,7 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:39' + #'squeak_changestamp' : 'ACL 7/7/2024 18:27' } WBElementPopUpTests >> testButtonsOfPopUp [ | element mouseEvent | @@ -14,17 +14,18 @@ WBElementPopUpTests >> testButtonsOfPopUp [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. element mouseDown: mouseEvent. + self assert: element popUp submorphs size = 4 ] { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:40' + #'squeak_changestamp' : 'ACL 7/7/2024 18:27' } WBElementPopUpTests >> testExistenceOfPopUp [ | element mouseEvent | @@ -32,18 +33,19 @@ WBElementPopUpTests >> testExistenceOfPopUp [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. element mouseDown: mouseEvent. + self assert: element popUp notNil ] { #category : #tests, - #'squeak_changestamp' : 'si 7/5/2024 12:01' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfBorderColor [ | element mouseEvent buttonForColor | @@ -51,7 +53,7 @@ WBElementPopUpTests >> testFunctionalityOfBorderColor [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. @@ -61,21 +63,21 @@ WBElementPopUpTests >> testFunctionalityOfBorderColor [ self assert: element popUp popUp submorphs size = 12. buttonForColor := element popUp popUp submorphs at: 1. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: element morph borderColor = Color magenta muchDarker. buttonForColor := element popUp popUp submorphs at: 6. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: element morph borderColor = Color green. buttonForColor := element popUp popUp submorphs at: 10. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: element morph borderColor = Color transparent. ] { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:40' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfBorderColorPopUp [ | element mouseEvent | @@ -83,7 +85,7 @@ WBElementPopUpTests >> testFunctionalityOfBorderColorPopUp [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. @@ -95,7 +97,7 @@ WBElementPopUpTests >> testFunctionalityOfBorderColorPopUp [ { #category : #tests, - #'squeak_changestamp' : 'si 7/5/2024 11:59' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfColor [ | element mouseEvent buttonForColor | @@ -103,7 +105,7 @@ WBElementPopUpTests >> testFunctionalityOfColor [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. @@ -113,21 +115,21 @@ WBElementPopUpTests >> testFunctionalityOfColor [ self assert: element popUp popUp submorphs size = 12. buttonForColor := element popUp popUp submorphs at: 1. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: element color = Color magenta muchDarker. buttonForColor := element popUp popUp submorphs at: 6. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: element color = Color green. buttonForColor := element popUp popUp submorphs at: 10. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: element color = Color transparent. ] { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:40' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfColorPopUp [ | element mouseEvent | @@ -135,7 +137,7 @@ WBElementPopUpTests >> testFunctionalityOfColorPopUp [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. @@ -147,7 +149,7 @@ WBElementPopUpTests >> testFunctionalityOfColorPopUp [ { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:40' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfCopy [ | element mouseEvent | @@ -155,7 +157,7 @@ WBElementPopUpTests >> testFunctionalityOfCopy [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. @@ -167,7 +169,7 @@ WBElementPopUpTests >> testFunctionalityOfCopy [ { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:40' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfDelete [ | element mouseEvent | @@ -175,7 +177,7 @@ WBElementPopUpTests >> testFunctionalityOfDelete [ mouseEvent := MouseButtonEvent new. mouseEvent setType: #mouseDown position: self canvas position + (100 @ 100) which: 4 buttons: mouseEvent class redButton hand: HandMorph new stamp: 0. - self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (WBRectangle newWithCanvas: self canvas) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self canvas dropElement: mouseEvent. element := self canvas elements at: 1. @@ -187,7 +189,7 @@ WBElementPopUpTests >> testFunctionalityOfDelete [ { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:40' + #'squeak_changestamp' : 'ACL 7/7/2024 18:28' } WBElementPopUpTests >> testFunctionalityOfSwitchVisibilityOfArrowHead [ | element mouseEvent1 mouseEvent2 | @@ -198,7 +200,7 @@ WBElementPopUpTests >> testFunctionalityOfSwitchVisibilityOfArrowHead [ mouseEvent2 setType: #mouseDown position: self canvas position + (200 @ 200) which: 4 buttons: mouseEvent2 class redButton hand: HandMorph new stamp: 0. element := ((WBLine newWithCanvas: self canvas) arrowHead: true). - self canvas spawnAnElement: (element) At: (MouseButtonEvent new position: self canvas position + (100@100)). + self canvas spawnAnElement: (element) At: (MouseButtonEvent new position: self canvas position + (100 @ 100)). element mouseUp: mouseEvent1. element mouseUp: mouseEvent2. diff --git a/src/SqueakWhiteboard-Tests/WBElementResizeTests.class.st b/src/SqueakWhiteboard-Tests/WBElementResizeTests.class.st index 4fbd921..450a994 100644 --- a/src/SqueakWhiteboard-Tests/WBElementResizeTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBElementResizeTests.class.st @@ -20,240 +20,240 @@ WBElementResizeTests >> testOpenFrame [ { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:58' + #'squeak_changestamp' : 'ACL 7/7/2024 18:29' } WBElementResizeTests >> testRectangleResizeBottom [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeBottom: 250. + self assert: rectangle bottom = 250 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:58' + #'squeak_changestamp' : 'ACL 7/7/2024 18:29' } WBElementResizeTests >> testRectangleResizeBottomMin [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeBottom: 100. - self assert: rectangle bottom = (100+WBResizeFrame resizeWidth) + + self assert: rectangle bottom = (100 + WBResizeFrame resizeWidth) ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:58' + #'squeak_changestamp' : 'ACL 7/7/2024 18:30' } WBElementResizeTests >> testRectangleResizeButtomBorder [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeBottom: 350. - self assert: rectangle bottom= 300 + + self assert: rectangle bottom = 300 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:58' + #'squeak_changestamp' : 'ACL 7/7/2024 18:30' } WBElementResizeTests >> testRectangleResizeLeft [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeLeft: 50. + self assert: rectangle left = 50 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:58' + #'squeak_changestamp' : 'ACL 7/7/2024 18:30' } WBElementResizeTests >> testRectangleResizeLeftBorder [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeLeft: -10. + self assert: rectangle left = 0 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:58' + #'squeak_changestamp' : 'ACL 7/7/2024 18:30' } WBElementResizeTests >> testRectangleResizeLeftMin [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeLeft: 250. + self assert: rectangle left = (200 - (WBResizeFrame resizeWidth)) ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:59' + #'squeak_changestamp' : 'ACL 7/7/2024 18:31' } WBElementResizeTests >> testRectangleResizeRight [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeRight: 250. + self assert: rectangle right = 250 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:59' + #'squeak_changestamp' : 'ACL 7/7/2024 18:31' } WBElementResizeTests >> testRectangleResizeRightBorder [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeRight: 350. - self assert: rectangle right= 300 + + self assert: rectangle right = 300 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 19:00' + #'squeak_changestamp' : 'ACL 7/7/2024 18:31' } WBElementResizeTests >> testRectangleResizeRightMin [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeRight: 100. - self assert: rectangle right = (100+WBResizeFrame resizeWidth) + + self assert: rectangle right = (100 + WBResizeFrame resizeWidth) ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 19:00' + #'squeak_changestamp' : 'ACL 7/7/2024 18:32' } WBElementResizeTests >> testRectangleResizeTop [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeTop: 50. + self assert: rectangle top = 50 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 19:00' + #'squeak_changestamp' : 'ACL 7/7/2024 18:32' } WBElementResizeTests >> testRectangleResizeTopBorder [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeTop: -10. + self assert: rectangle top = 0 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 19:00' + #'squeak_changestamp' : 'ACL 7/7/2024 18:32' } WBElementResizeTests >> testRectangleResizeTopMin [ | rectangle frame | - self canvas position: 0@0. - self canvas extent: 300@300. + self canvas position: 0 @ 0. + self canvas extent: 300 @ 300. rectangle := WBRectangle newWithCanvas: self canvas. - rectangle position: 100@100. - rectangle extent: 100@100. + rectangle position: 100 @ 100. + rectangle extent: 100 @ 100. rectangle addResizeFrame. frame := rectangle resizeFrame. - frame resizeTop: 250. + self assert: rectangle top = (200 - (WBResizeFrame resizeWidth)) ] diff --git a/src/SqueakWhiteboard-Tests/WBElementTests.class.st b/src/SqueakWhiteboard-Tests/WBElementTests.class.st index fcb3178..51f095d 100644 --- a/src/SqueakWhiteboard-Tests/WBElementTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBElementTests.class.st @@ -48,7 +48,7 @@ WBElementTests >> tearDown [ { #category : #testing, - #'squeak_changestamp' : 'is 6/26/2024 10:42' + #'squeak_changestamp' : 'ACL 7/7/2024 18:27' } WBElementTests >> testMouseDown [ | aMouseEvent anElement | @@ -57,6 +57,7 @@ WBElementTests >> testMouseDown [ aMouseEvent := MouseButtonEvent new. aMouseEvent setType: #mouseDown position: anElement position which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0. self assert: (self canvas handlesMouseOver: aMouseEvent) = true. + anElement supportsText: true. self assert: (self canvas handlesMouseDown: aMouseEvent) = (anElement textField enabled) not. diff --git a/src/SqueakWhiteboard-Tests/WBGlobalColorPopUpTests.class.st b/src/SqueakWhiteboard-Tests/WBGlobalColorPopUpTests.class.st index 82e6e98..f2ffd23 100644 --- a/src/SqueakWhiteboard-Tests/WBGlobalColorPopUpTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBGlobalColorPopUpTests.class.st @@ -6,103 +6,103 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:32' + #'squeak_changestamp' : 'ACL 7/7/2024 18:22' } WBGlobalColorPopUpTests >> testButtonFunctionality [ | button buttonForColor | button := self canvas toolbar buttons at: 5. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 1. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color black. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 2. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color gray. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 3. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color green. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 4. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color cyan. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 5. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color blue. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 6. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color magenta. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 7. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color red. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 8. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color orange. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForColor := self canvas toolbar popUp submorphs at: 9. - buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForColor clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas globalColor = Color yellow ] { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:32' + #'squeak_changestamp' : 'ACL 7/7/2024 18:22' } WBGlobalColorPopUpTests >> testButtonsOfPopUp [ | button | button := self canvas toolbar buttons at: 5. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp submorphs size = 9 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:32' + #'squeak_changestamp' : 'ACL 7/7/2024 18:23' } WBGlobalColorPopUpTests >> testExistenceOfPopUp [ | button | button := self canvas toolbar buttons at: 5. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp notNil ] { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:32' + #'squeak_changestamp' : 'ACL 7/7/2024 18:23' } WBGlobalColorPopUpTests >> testPopUpPlacementInX [ | button | button := self canvas toolbar buttons at: 5. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: button right <= self canvas toolbar popUp left. self assert: self canvas toolbar popUp left <= (button right + 200) @@ -110,13 +110,13 @@ WBGlobalColorPopUpTests >> testPopUpPlacementInX [ { #category : #tests, - #'squeak_changestamp' : 'is 6/26/2024 11:32' + #'squeak_changestamp' : 'ACL 7/7/2024 18:23' } WBGlobalColorPopUpTests >> testPopUpPlacementInY [ | button | button := self canvas toolbar buttons at: 5. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: button center y - 200 < self canvas toolbar popUp top. self assert: self canvas toolbar popUp bottom < (button center y + 500) diff --git a/src/SqueakWhiteboard-Tests/WBLineChoosingPopUpTests.class.st b/src/SqueakWhiteboard-Tests/WBLineChoosingPopUpTests.class.st index 51ba3d7..28c40e1 100644 --- a/src/SqueakWhiteboard-Tests/WBLineChoosingPopUpTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBLineChoosingPopUpTests.class.st @@ -6,60 +6,60 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 7/1/2024 22:37' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBLineChoosingPopUpTests >> testButtonFunctionality [ | button buttonForLine | button := self canvas toolbar buttons at: 2. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForLine := self canvas toolbar popUp submorphs at: 1. - buttonForLine clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForLine clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas elementToSpawn notNil. self assert: self canvas elementToSpawn arrowHead = true. buttonForLine := self canvas toolbar popUp submorphs at: 2. - buttonForLine clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForLine clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas elementToSpawn notNil. - self assert: self canvas elementToSpawn arrowHead = false. + self assert: self canvas elementToSpawn arrowHead = false ] { #category : #tests, - #'squeak_changestamp' : 'si 6/25/2024 14:17' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBLineChoosingPopUpTests >> testButtonsOfPopUp [ | button | button := self canvas toolbar buttons at: 2. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp submorphs size = 2 ] { #category : #tests, - #'squeak_changestamp' : 'si 6/25/2024 14:17' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBLineChoosingPopUpTests >> testExistenceOfPopUp [ | button | button := self canvas toolbar buttons at: 2. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp notNil ] { #category : #tests, - #'squeak_changestamp' : 'si 6/25/2024 14:17' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBLineChoosingPopUpTests >> testPopUpPlacementInX [ | button | button := self canvas toolbar buttons at: 2. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: button right <= self canvas toolbar popUp left. self assert: self canvas toolbar popUp left <= (button right + 200) @@ -67,13 +67,13 @@ WBLineChoosingPopUpTests >> testPopUpPlacementInX [ { #category : #tests, - #'squeak_changestamp' : 'si 6/25/2024 14:17' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBLineChoosingPopUpTests >> testPopUpPlacementInY [ | button | button := self canvas toolbar buttons at: 2. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: button center y - 200 < self canvas toolbar popUp top. self assert: self canvas toolbar popUp bottom < (button center y + 500) diff --git a/src/SqueakWhiteboard-Tests/WBShapeChoosingPopUpTests.class.st b/src/SqueakWhiteboard-Tests/WBShapeChoosingPopUpTests.class.st index d3747e1..4910e87 100644 --- a/src/SqueakWhiteboard-Tests/WBShapeChoosingPopUpTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBShapeChoosingPopUpTests.class.st @@ -6,58 +6,58 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:54' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBShapeChoosingPopUpTests >> testButtonFunctionality [ | button buttonForShape | button := self canvas toolbar buttons at: 1. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). buttonForShape := self canvas toolbar popUp submorphs at: 1. - buttonForShape clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForShape clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas elementToSpawn class = WBRectangle. buttonForShape := self canvas toolbar popUp submorphs at: 2. - buttonForShape clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + buttonForShape clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas elementToSpawn class = WBCircle ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:54' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBShapeChoosingPopUpTests >> testButtonsOfPopUp [ | button | button := self canvas toolbar buttons at: 1. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp submorphs size = 2 ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:54' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBShapeChoosingPopUpTests >> testExistenceOfPopUp [ | button | button := self canvas toolbar buttons at: 1. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: self canvas toolbar popUp notNil ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:54' + #'squeak_changestamp' : 'ACL 7/7/2024 18:24' } WBShapeChoosingPopUpTests >> testPopUpPlacementInX [ | button | button := self canvas toolbar buttons at: 1. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: button right <= self canvas toolbar popUp left. self assert: self canvas toolbar popUp left <= (button right + 200) @@ -65,13 +65,13 @@ WBShapeChoosingPopUpTests >> testPopUpPlacementInX [ { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:54' + #'squeak_changestamp' : 'ACL 7/7/2024 18:25' } WBShapeChoosingPopUpTests >> testPopUpPlacementInY [ | button | button := self canvas toolbar buttons at: 1. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). self assert: button center y - 200 < self canvas toolbar popUp top. self assert: self canvas toolbar popUp bottom < (button center y + 500) diff --git a/src/SqueakWhiteboard-Tests/WBToolbarButtonTests.class.st b/src/SqueakWhiteboard-Tests/WBToolbarButtonTests.class.st index ccfa0d7..9f95021 100644 --- a/src/SqueakWhiteboard-Tests/WBToolbarButtonTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBToolbarButtonTests.class.st @@ -6,23 +6,24 @@ Class { { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:52' + #'squeak_changestamp' : 'ACL 7/7/2024 18:19' } WBToolbarButtonTests >> testButtonFunctionality [ | button | button := self canvas toolbar buttons at: 1. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)) + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)) ] { #category : #tests, - #'squeak_changestamp' : 'is 6/21/2024 18:52' + #'squeak_changestamp' : 'ACL 7/7/2024 18:26' } WBToolbarButtonTests >> testNoteButtonFunctionality [ | button | button := self canvas toolbar buttons at: 3. - button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100@100)). + button clickFunctionality: (MouseButtonEvent new position: self canvas position + (100 @ 100)). + self assert: self canvas elementToSpawn class = WBNote ] From c2498420fcd0926509f65ecf4b15659d8025bcb3 Mon Sep 17 00:00:00 2001 From: Alicia Cabrejas Leonhardt Date: Sun, 7 Jul 2024 19:56:12 +0200 Subject: [PATCH 2/2] style guide --- .../WBResizeBarTests.class.st | 9 ++- .../WBResizeHandleTests.class.st | 6 +- .../WBTextfieldTests.class.st | 55 +++++++++++++------ 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/src/SqueakWhiteboard-Tests/WBResizeBarTests.class.st b/src/SqueakWhiteboard-Tests/WBResizeBarTests.class.st index 625ea40..1115a0b 100644 --- a/src/SqueakWhiteboard-Tests/WBResizeBarTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBResizeBarTests.class.st @@ -48,7 +48,7 @@ WBResizeBarTests >> tearDown [ { #category : #testing, - #'squeak_changestamp' : 'is 6/26/2024 10:41' + #'squeak_changestamp' : 'ACL 7/7/2024 19:50' } WBResizeBarTests >> testMouseDown [ | aResizeBar aMouseEvent | @@ -56,12 +56,13 @@ WBResizeBarTests >> testMouseDown [ aResizeBar := WBResizeBar new. aMouseEvent := MouseButtonEvent new. aMouseEvent setType: #mouseDown position: aResizeBar position which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0. + self assert: (aResizeBar handlesMouseDown: aMouseEvent) = true ] { #category : #testing, - #'squeak_changestamp' : 'JK 6/25/2024 16:09' + #'squeak_changestamp' : 'ACL 7/7/2024 19:50' } WBResizeBarTests >> testMouseOver [ | aResizeBar aMouseEvent | @@ -69,12 +70,13 @@ WBResizeBarTests >> testMouseOver [ aResizeBar := WBResizeBar new. aMouseEvent := MouseButtonEvent new. aMouseEvent setType: #mouseDown position: aResizeBar position which: 4 buttons: aMouseEvent class redButton hand: HandMorph new stamp: 0. + self assert: (aResizeBar handlesMouseOver: aMouseEvent) = true ] { #category : #testing, - #'squeak_changestamp' : 'is 6/26/2024 10:24' + #'squeak_changestamp' : 'ACL 7/7/2024 19:51' } WBResizeBarTests >> testResizeCursor [ | aResizeBar aMouseEvent prevCursor | @@ -86,6 +88,7 @@ WBResizeBarTests >> testResizeCursor [ aResizeBar mouseEnter: aMouseEvent. self assert: Cursor currentCursor = Cursor move. + aResizeBar mouseLeave: aMouseEvent. self assert: Cursor currentCursor = prevCursor ] diff --git a/src/SqueakWhiteboard-Tests/WBResizeHandleTests.class.st b/src/SqueakWhiteboard-Tests/WBResizeHandleTests.class.st index 349962d..329b9eb 100644 --- a/src/SqueakWhiteboard-Tests/WBResizeHandleTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBResizeHandleTests.class.st @@ -78,7 +78,7 @@ WBResizeHandleTests >> testMouseOver [ { #category : #testing, - #'squeak_changestamp' : 'is 6/26/2024 10:34' + #'squeak_changestamp' : 'ACL 7/7/2024 19:51' } WBResizeHandleTests >> testResizeCursor [ | aResizeHandleBottomLeft aResizeHandleBottomRight aResizeHandleTopLeft aResizeHandleTopRight aMouseEvent prevCursor | @@ -93,21 +93,25 @@ WBResizeHandleTests >> testResizeCursor [ aResizeHandleBottomLeft mouseEnter: aMouseEvent. self assert: Cursor currentCursor = Cursor resizeBottomLeft. + aResizeHandleBottomLeft mouseLeave: aMouseEvent. self assert: Cursor currentCursor = prevCursor. aResizeHandleBottomRight mouseEnter: aMouseEvent. self assert: Cursor currentCursor = Cursor resizeBottomRight. + aResizeHandleBottomLeft mouseLeave: aMouseEvent. self assert: Cursor currentCursor = prevCursor. aResizeHandleTopLeft mouseEnter: aMouseEvent. self assert: Cursor currentCursor = Cursor resizeTopLeft. + aResizeHandleBottomLeft mouseLeave: aMouseEvent. self assert: Cursor currentCursor = prevCursor. aResizeHandleTopRight mouseEnter: aMouseEvent. self assert: Cursor currentCursor = Cursor resizeTopRight. + aResizeHandleBottomLeft mouseLeave: aMouseEvent. self assert: Cursor currentCursor = prevCursor ] diff --git a/src/SqueakWhiteboard-Tests/WBTextfieldTests.class.st b/src/SqueakWhiteboard-Tests/WBTextfieldTests.class.st index b560e38..7bf32a9 100644 --- a/src/SqueakWhiteboard-Tests/WBTextfieldTests.class.st +++ b/src/SqueakWhiteboard-Tests/WBTextfieldTests.class.st @@ -48,32 +48,33 @@ WBTextfieldTests >> tearDown [ { #category : #testing, - #'squeak_changestamp' : 'is 6/18/2024 22:49' + #'squeak_changestamp' : 'ACL 7/7/2024 19:55' } WBTextfieldTests >> testCenteredText [ | anElement | anElement := WBRectangle newWithCanvas: self canvas. "alignment = 2 means centered" + self assert: anElement textField textMorph textStyle alignment = 2 ] { #category : #testing, - #'squeak_changestamp' : 'is 6/22/2024 00:06' + #'squeak_changestamp' : 'ACL 7/7/2024 19:52' } WBTextfieldTests >> testDefaultContents [ | anElement | anElement := WBRectangle newWithCanvas: self canvas. - self assert: anElement supportsText = true. "sonst ist dieser Test nutzlos" - self assert: anElement textField textMorph contents = '' + + self assert: anElement supportsText = true ] { #category : #testing, - #'squeak_changestamp' : 'is 6/22/2024 00:22' + #'squeak_changestamp' : 'ACL 7/7/2024 19:53' } WBTextfieldTests >> testKeyboardInputOfTextfield [ | anElement aKeyboardEvent | @@ -81,10 +82,13 @@ WBTextfieldTests >> testKeyboardInputOfTextfield [ anElement := WBRectangle newWithCanvas: self canvas. aKeyboardEvent := KeyboardEvent new. "keyValue: 69 = e" - aKeyboardEvent setType: #keystroke buttons: 1 position: 0@0 keyValue: 69 hand: anElement currentHand stamp: 0. - self assert: anElement supportsText = true. "Sonst ist dieser Test nutzlos" + aKeyboardEvent setType: #keystroke buttons: 1 position: 0 @ 0 keyValue: 69 hand: anElement currentHand stamp: 0. + + self assert: anElement supportsText = true. + anElement textField textMorph keyStroke: aKeyboardEvent. self assert: anElement textField textMorph contents = 'E'. + self assert: anElement textField hasUnacceptedEdits = false @@ -93,7 +97,7 @@ WBTextfieldTests >> testKeyboardInputOfTextfield [ { #category : #testing, - #'squeak_changestamp' : 'is 6/22/2024 00:07' + #'squeak_changestamp' : 'ACL 7/7/2024 19:53' } WBTextfieldTests >> testSupportsText [ | anElement | @@ -101,15 +105,17 @@ WBTextfieldTests >> testSupportsText [ anElement := WBRectangle newWithCanvas: self canvas. anElement supportsText: false. self assert: (anElement textField) isNil = true. + anElement supportsText: true. self assert: (anElement textField) isNil = false. + anElement supportsText: false. self assert: (anElement textField) isNil = true ] { #category : #testing, - #'squeak_changestamp' : 'is 6/18/2024 23:02' + #'squeak_changestamp' : 'ACL 7/7/2024 19:53' } WBTextfieldTests >> testTextfieldActivation [ | elements aFirstMouseEvent aSecondMouseEvent aThirdMouseEvent | @@ -126,13 +132,17 @@ WBTextfieldTests >> testTextfieldActivation [ elements do: [:anElement | anElement supportsText ifTrue: [ self assert: anElement textField enabled = false. + anElement mouseDown: aFirstMouseEvent. anElement mouseDown: aSecondMouseEvent. self assert: anElement textField enabled = false. + anElement mouseDown: aThirdMouseEvent. self assert: anElement textField enabled = true. + self assert: self canvas activeElement = nil. - self assert: self canvas activeTextbox = anElement]]. + + self assert: self canvas activeTextbox = anElement]] @@ -141,7 +151,7 @@ WBTextfieldTests >> testTextfieldActivation [ { #category : #testing, - #'squeak_changestamp' : 'is 6/26/2024 10:21' + #'squeak_changestamp' : 'ACL 7/7/2024 19:53' } WBTextfieldTests >> testTextfieldCursor [ | anElement aFirstMouseEvent prevCursor | @@ -153,13 +163,14 @@ WBTextfieldTests >> testTextfieldCursor [ prevCursor := Cursor currentCursor. anElement textField textMorph mouseEnter: aFirstMouseEvent. self assert: Cursor currentCursor = Cursor text. + anElement textField textMorph mouseLeave: aFirstMouseEvent. self assert: Cursor currentCursor = prevCursor ] { #category : #testing, - #'squeak_changestamp' : 'is 6/21/2024 19:00' + #'squeak_changestamp' : 'ACL 7/7/2024 19:54' } WBTextfieldTests >> testTextfieldDeactivationViaCanvas [ | elements aFirstMouseEvent aSecondMouseEvent | @@ -169,14 +180,16 @@ WBTextfieldTests >> testTextfieldDeactivationViaCanvas [ aFirstMouseEvent := MouseButtonEvent new. aFirstMouseEvent setType: #mouseDown position: elements first position which: 4 buttons: aFirstMouseEvent class redButton hand: HandMorph new stamp: 0. aSecondMouseEvent := MouseButtonEvent new. - aSecondMouseEvent setType: #mouseDown position: elements first position + (1@1) which: 4 buttons: aSecondMouseEvent class redButton hand: HandMorph new stamp: 0. + aSecondMouseEvent setType: #mouseDown position: elements first position + (1 @ 1) which: 4 buttons: aSecondMouseEvent class redButton hand: HandMorph new stamp: 0. elements do: [:anElement | anElement supportsText ifTrue: [ anElement activateTextbox: aFirstMouseEvent. + self assert: self canvas activeElement = nil. self assert: self canvas activeTextbox = anElement. self canvas mouseDown: aSecondMouseEvent. + self assert: anElement textField enabled = false. self assert: self canvas activeTextbox = nil]]. @@ -185,7 +198,7 @@ WBTextfieldTests >> testTextfieldDeactivationViaCanvas [ { #category : #testing, - #'squeak_changestamp' : 'is 6/21/2024 20:41' + #'squeak_changestamp' : 'ACL 7/7/2024 19:54' } WBTextfieldTests >> testTextfieldDeactivationViaElement [ | aFirstElement aSecondElement aFirstMouseEvent aSecondMouseEvent | @@ -199,16 +212,19 @@ WBTextfieldTests >> testTextfieldDeactivationViaElement [ aSecondMouseEvent setType: #mouseDown position: aSecondElement position which: 4 buttons: aSecondMouseEvent class redButton hand: HandMorph new stamp: 0. aFirstElement activateTextbox: aFirstMouseEvent. + self assert: self canvas activeElement = nil. self assert: self canvas activeTextbox = aFirstElement. + aSecondElement mouseDown: aSecondMouseEvent. + self assert: aFirstElement textField enabled = false. self assert: self canvas activeTextbox = nil ] { #category : #testing, - #'squeak_changestamp' : 'is 6/21/2024 19:01' + #'squeak_changestamp' : 'ACL 7/7/2024 19:54' } WBTextfieldTests >> testTextfieldDeactivationViaEscape [ | anElement aMouseEvent aKeyboardEvent | @@ -221,16 +237,19 @@ WBTextfieldTests >> testTextfieldDeactivationViaEscape [ aKeyboardEvent setType: #keystroke buttons: 1 position: 0@0 keyValue: 27 hand: anElement currentHand stamp: 0. anElement activateTextbox: aMouseEvent. + self assert: self canvas activeElement = nil. self assert: self canvas activeTextbox = anElement. + anElement textField textMorph keyStroke: aKeyboardEvent. + self assert: anElement textField enabled = false. - self assert: self canvas activeTextbox = nil. + self assert: self canvas activeTextbox = nil ] { #category : #testing, - #'squeak_changestamp' : 'is 6/22/2024 01:18' + #'squeak_changestamp' : 'ACL 7/7/2024 19:54' } WBTextfieldTests >> testTextfieldKeyboardEventHandling [ | anElement aFirstMouseEvent aSecondMouseEvent aKeyboardEvent | @@ -241,11 +260,13 @@ WBTextfieldTests >> testTextfieldKeyboardEventHandling [ aSecondMouseEvent := MouseButtonEvent new. aSecondMouseEvent setType: #mouseDown position: anElement position which: 4 buttons: aSecondMouseEvent class redButton hand: HandMorph new stamp: 0. aKeyboardEvent := KeyboardEvent new. + self assert: (anElement textField handlesKeyboard: aFirstMouseEvent) = anElement textField enabled. self assert: (anElement textField textMorph handlesKeyboard: aKeyboardEvent) = false. anElement mouseDown: aFirstMouseEvent. anElement mouseDown: aSecondMouseEvent. + self assert: (anElement textField textMorph handlesKeyboard: aKeyboardEvent) = true ]