diff -r c3b09cef9f87 -r 2351db93aa5b RegressionTests__GraphicDrawingTest.st --- a/RegressionTests__GraphicDrawingTest.st Wed Jun 29 13:00:17 2016 +0000 +++ b/RegressionTests__GraphicDrawingTest.st Wed Jun 29 15:55:29 2016 +0200 @@ -1,4 +1,4 @@ -"{ Package: 'exept:regression' }" +"{ Package: 'stx:goodies/regression' }" "{ NameSpace: RegressionTests }" @@ -23,21 +23,21 @@ ! test_01_Clear - self - _testDraw:[:form | ] - thenCheck:[:form | - |blackPixel whitePixel pix| + self + _testDraw:[:form | ] + thenCheck:[:form | + |blackPixel whitePixel pix| - blackPixel := (Color black onDevice:Display) colorId. - whitePixel := (Color white onDevice:Display) colorId. + blackPixel := (Color black onDevice:Display) colorId. + whitePixel := (Color white onDevice:Display) colorId. - 0 to:form height-1 do:[:y | - 0 to:form width-1 do:[:x | - pix := form atX:x y:y. - self assert:( pix == blackPixel ) - ] - ] - ] + 0 to:form height-1 do:[:y | + 0 to:form width-1 do:[:x | + pix := form atX:x y:y. + self assert:( pix == blackPixel ) + ] + ] + ] " self new test_01_Clear @@ -45,34 +45,34 @@ ! test_02_DrawHLine - self - _testDraw:[:form | - form paint:Color white. - form displayLineFromX:1 y:0 toX:form width-1-1 y:0. - ] - thenCheck:[:form | - |blackPixel whitePixel pix| + self + _testDraw:[:form | + form paint:Color white. + form displayLineFromX:1 y:0 toX:form width-1-1 y:0. + ] + thenCheck:[:form | + |blackPixel whitePixel pix| - blackPixel := (Color black onDevice:Display) colorId. - whitePixel := (Color white onDevice:Display) colorId. + blackPixel := (Color black onDevice:Display) colorId. + whitePixel := (Color white onDevice:Display) colorId. - 1 to:form height-1 do:[:y | - 0 to:form width-1 do:[:x | - pix := form atX:x y:y. - self assert:( pix == blackPixel ) - ] - ]. + 1 to:form height-1 do:[:y | + 0 to:form width-1 do:[:x | + pix := form atX:x y:y. + self assert:( pix == blackPixel ) + ] + ]. - pix := form atX:0 y:0. - self assert:( pix == blackPixel ). - pix := form atX:(form width-1) y:0. - self assert:( pix == blackPixel ). + pix := form atX:0 y:0. + self assert:( pix == blackPixel ). + pix := form atX:(form width-1) y:0. + self assert:( pix == blackPixel ). - 1 to:form width-2 do:[:x | - pix := form atX:x y:0. - self assert:( pix == whitePixel ) - ] - ] + 1 to:form width-2 do:[:x | + pix := form atX:x y:0. + self assert:( pix == whitePixel ) + ] + ] " self new test_02_DrawHLine @@ -80,51 +80,51 @@ ! test_03_DrawRectangle - self - _testDraw:[:form | - form paint:Color white. - form displayRectangleX:1 y:1 width:(form width-1-1) height:(form height-1-1). - ] - thenCheck:[:form | - |blackPixel whitePixel pix| + self + _testDraw:[:form | + form paint:Color white. + form displayRectangleX:1 y:1 width:(form width-1-1) height:(form height-1-1). + ] + thenCheck:[:form | + |blackPixel whitePixel pix| - blackPixel := (Color black onDevice:Display) colorId. - whitePixel := (Color white onDevice:Display) colorId. + blackPixel := (Color black onDevice:Display) colorId. + whitePixel := (Color white onDevice:Display) colorId. - 2 to:form height-1-1-1 do:[:y | - 2 to:form width-1-1-1 do:[:x | - pix := form atX:x y:y. - self assert:( pix == blackPixel ) - ] - ]. + 2 to:form height-1-1-1 do:[:y | + 2 to:form width-1-1-1 do:[:x | + pix := form atX:x y:y. + self assert:( pix == blackPixel ) + ] + ]. - 0 to:form width-1 do:[:x | - pix := form atX:x y:0. - self assert:( pix == blackPixel ) - ]. - 0 to:form width-1 do:[:x | - pix := form atX:x y:(form height-1). - self assert:( pix == blackPixel ) - ]. - 0 to:form height-1 do:[:y | - pix := form atX:0 y:y. - self assert:( pix == blackPixel ) - ]. - 0 to:form height-1 do:[:y | - pix := form atX:(form width-1) y:y. - self assert:( pix == blackPixel ) - ]. + 0 to:form width-1 do:[:x | + pix := form atX:x y:0. + self assert:( pix == blackPixel ) + ]. + 0 to:form width-1 do:[:x | + pix := form atX:x y:(form height-1). + self assert:( pix == blackPixel ) + ]. + 0 to:form height-1 do:[:y | + pix := form atX:0 y:y. + self assert:( pix == blackPixel ) + ]. + 0 to:form height-1 do:[:y | + pix := form atX:(form width-1) y:y. + self assert:( pix == blackPixel ) + ]. - 1 to:form width-1-1 do:[:x | - pix := form atX:x y:1. - self assert:( pix == whitePixel ) - ]. - 1 to:form width-1-1 do:[:x | - pix := form atX:x y:(form height-2). - self assert:( pix == whitePixel ) - ]. + 1 to:form width-1-1 do:[:x | + pix := form atX:x y:1. + self assert:( pix == whitePixel ) + ]. + 1 to:form width-1-1 do:[:x | + pix := form atX:x y:(form height-2). + self assert:( pix == whitePixel ) + ]. - ] + ] " self new test_03_DrawRectangle @@ -132,34 +132,34 @@ ! test_03_DrawVLine - self - _testDraw:[:form | - form paint:Color white. - form displayLineFromX:0 y:1 toX:0 y:form height-1-1. - ] - thenCheck:[:form | - |blackPixel whitePixel pix| + self + _testDraw:[:form | + form paint:Color white. + form displayLineFromX:0 y:1 toX:0 y:form height-1-1. + ] + thenCheck:[:form | + |blackPixel whitePixel pix| - blackPixel := (Color black onDevice:Display) colorId. - whitePixel := (Color white onDevice:Display) colorId. + blackPixel := (Color black onDevice:Display) colorId. + whitePixel := (Color white onDevice:Display) colorId. - 0 to:form height-1 do:[:y | - 1 to:form width-1 do:[:x | - pix := form atX:x y:y. - self assert:( pix == blackPixel ) - ] - ]. + 0 to:form height-1 do:[:y | + 1 to:form width-1 do:[:x | + pix := form atX:x y:y. + self assert:( pix == blackPixel ) + ] + ]. - pix := form atX:0 y:0. - self assert:( pix == blackPixel ). - pix := form atX:0 y:(form height-1). - self assert:( pix == blackPixel ). + pix := form atX:0 y:0. + self assert:( pix == blackPixel ). + pix := form atX:0 y:(form height-1). + self assert:( pix == blackPixel ). - 1 to:form height-2 do:[:y | - pix := form atX:0 y:y. - self assert:( pix == whitePixel ) - ] - ] + 1 to:form height-2 do:[:y | + pix := form atX:0 y:y. + self assert:( pix == whitePixel ) + ] + ] " self new test_03_DrawVLine