Skip to content

Commit

Permalink
fixed renderingPerformance Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mschroederi
mschroederi committed Jul 25, 2018
1 parent cc0b8f0 commit 3265df5
Show file tree
Hide file tree
Showing 34 changed files with 54 additions and 69 deletions.
3 changes: 1 addition & 2 deletions packages/Material-Core.package/MDList.class/instance/drawOn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ drawing
drawOn: aCanvas

super drawOn: aCanvas.
self drawItemsOn: aCanvas.
self drawScrollbarOn: aCanvas
self drawItemsOn: aCanvas
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDList.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"drawFilterFor:on:at:" : "LS 7/10/2018 12:13",
"drawItem:on:" : "LS 7/10/2018 12:14",
"drawItemsOn:" : "LS 6/28/2018 17:39",
"drawOn:" : "CG 7/1/2018 12:05",
"drawOn:" : "mats 7/25/2018 14:07",
"filterBoundsForItem:with:at:" : "LS 7/10/2018 12:14",
"filterColor" : "LS 6/28/2018 16:55",
"filterList" : "CG 7/1/2018 12:07",
Expand Down
5 changes: 0 additions & 5 deletions packages/Material-Core.package/MDScrollableWidget.class/instance/drawScrollbarOn..st
View file

This file was deleted.

1 change: 0 additions & 1 deletion packages/Material-Core.package/MDScrollableWidget.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
},
"instance" : {
"contentHeight" : "mats 7/25/2018 11:09",
"drawScrollbarOn:" : "mats 7/25/2018 11:09",
"initialize" : "mats 7/25/2018 11:09",
"layoutChanged" : "mats 6/8/2018 15:25",
"maxScrollDelta" : "mats 6/13/2018 10:50",
Expand Down
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDDialogTest.class/class/updateBasicMockObject.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mock object helper methods
updateBasicMockObject

self renderFormString: self new basicDialog andStoreWithName: 'basic'
self renderOnFormString: self new basicDialog andStoreWithName: 'basic'
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDDialogTest.class/class/updateCustomMockObject.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mock object helper methods
updateCustomMockObject

self renderFormString: self new customDialog andStoreWithName: 'custom'
self renderOnFormString: self new customDialog andStoreWithName: 'custom'
4 changes: 2 additions & 2 deletions packages/Material-Tests.package/MDDialogTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"classToTest" : "mats 6/13/2018 10:16",
"custom" : "LS 7/19/2018 16:45",
"updateAllMockObjects" : "mats 6/13/2018 11:19",
"updateBasicMockObject" : "mats 6/13/2018 11:19",
"updateCustomMockObject" : "mats 6/13/2018 11:19" },
"updateBasicMockObject" : "mats 7/25/2018 14:15",
"updateCustomMockObject" : "mats 7/25/2018 14:14" },
"instance" : {
"basicDialog" : "mats 6/13/2018 11:17",
"customDialog" : "mats 6/13/2018 11:17",
Expand Down
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDListTest.class/class/updateEnabledMockObject.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mock object helper methods
updateEnabledMockObject

self renderFormString: MDBasicListExample new andStoreWithName: 'enabled'
self renderOnFormString: MDBasicListExample new andStoreWithName: 'enabled'
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDListTest.class/class/updateFilteredMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ updateFilteredMockObject
| list |
list := MDBasicListExample new
filterList: '2'.
self renderFormString: list andStoreWithName: 'filtered'
self renderOnFormString: list andStoreWithName: 'filtered'
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDListTest.class/class/updateScrolledToBottomMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateScrolledToBottomMockObject

self
renderFormString: self new listScrolledDownToBottomWidget
renderOnFormString: self new listScrolledDownToBottomWidget
andStoreWithName: 'listScrolledDownToBottom'
2 changes: 1 addition & 1 deletion ...ial-Tests.package/MDListTest.class/class/updateScrolledToBottomWithScrollbarMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateScrolledToBottomWithScrollbarMockObject

self
renderFormString: self new listWithScrollbarScrolledDownToBottomWidget
renderOnFormString: self new listWithScrollbarScrolledDownToBottomWidget
andStoreWithName: 'listWithScrollbarScrolledDownToBottom'
8 changes: 4 additions & 4 deletions packages/Material-Tests.package/MDListTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"listScrolledDownToBottom" : "LS 7/19/2018 16:45",
"listWithScrollbarScrolledDownToBottom" : "LS 7/19/2018 16:45",
"updateAllMockObjects" : "LS 6/28/2018 22:04",
"updateEnabledMockObject" : "mats 6/14/2018 14:00",
"updateFilteredMockObject" : "LS 6/28/2018 17:59",
"updateScrolledToBottomMockObject" : "LS 7/19/2018 15:39",
"updateScrolledToBottomWithScrollbarMockObject" : "LS 7/19/2018 15:37" },
"updateEnabledMockObject" : "mats 7/25/2018 14:15",
"updateFilteredMockObject" : "mats 7/25/2018 14:15",
"updateScrolledToBottomMockObject" : "mats 7/25/2018 14:15",
"updateScrolledToBottomWithScrollbarMockObject" : "mats 7/25/2018 14:15" },
"instance" : {
"listScrolledDownToBottomWidget" : "LS 7/19/2018 15:35",
"listWithScrollbarScrolledDownToBottomWidget" : "LS 7/19/2018 15:37",
Expand Down
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDMenuTest.class/class/updateMouseDownMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateMouseDownMockObject

self
renderFormString: self new mouseDownWidget
renderOnFormString: self new mouseDownWidget
andStoreWithName: 'mouseDown'
2 changes: 1 addition & 1 deletion .../Material-Tests.package/MDMenuTest.class/class/updateMouseEnterOnCascadeItemMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ updateMouseEnterOnCascadeItemMockObject
| menu |
menu := self new mouseEnterOnCascadeItemWidget.
self
renderFormString: menu
renderOnFormString: menu
andStoreWithName: 'mouseEnterOnCascadeItem'.
menu delete
4 changes: 2 additions & 2 deletions packages/Material-Tests.package/MDMenuTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"mouseEnterOnCascadeItem" : "LS 7/19/2018 16:45",
"tests" : "LS 7/19/2018 14:53",
"updateAllMockObjects" : "LS 7/19/2018 16:45",
"updateMouseDownMockObject" : "LS 7/19/2018 16:44",
"updateMouseEnterOnCascadeItemMockObject" : "LS 7/19/2018 16:44" },
"updateMouseDownMockObject" : "mats 7/25/2018 14:15",
"updateMouseEnterOnCascadeItemMockObject" : "mats 7/25/2018 14:15" },
"instance" : {
"cascadeMenuItem" : "LS 6/18/2018 13:50",
"cascadeMenuWidget" : "LS 7/19/2018 16:38",
Expand Down
2 changes: 1 addition & 1 deletion ...ass/renderFormString.andStoreWithName..st → ...s/renderOnFormString.andStoreWithName..st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
utils
renderFormString: aMDWidget andStoreWithName: aString
renderOnFormString: aMDWidget andStoreWithName: aString

| name source content |

Expand Down
10 changes: 1 addition & 9 deletions packages/Material-Tests.package/MDPixelBasedTestCase.class/class/tests.st
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
mock object helper methods
tests

^ Dictionary new
at: #enabled put: false;
at: #disabled put: false;
at: #alternativeText put: false;
at: #alternativeBackgroundColor put: false;
at: #mouseEnter put: false;
at: #toggleOn put: false;
at: #ripples put: false;
yourself
self subclassResponsibility
2 changes: 1 addition & 1 deletion ...ts.package/MDPixelBasedTestCase.class/class/updateAlternativeBackgroundColorMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateAlternativeBackgroundColorMockObject

self
renderFormString: self new alternativeBackgroundColorWidget
renderOnFormString: self new alternativeBackgroundColorWidget
andStoreWithName: 'alternativeBackgroundColor'
2 changes: 1 addition & 1 deletion ...aterial-Tests.package/MDPixelBasedTestCase.class/class/updateAlternativeTextMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateAlternativeTextMockObject

self
renderFormString: self new alternativeTextWidget
renderOnFormString: self new alternativeTextWidget
andStoreWithName: 'alternativeText'
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDPixelBasedTestCase.class/class/updateDisabledMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateDisabledMockObject

self
renderFormString: self new disabledWidget
renderOnFormString: self new disabledWidget
andStoreWithName: 'disabled'
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDPixelBasedTestCase.class/class/updateEnabledMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateEnabledMockObject

self
renderFormString: self new enabledWidget
renderOnFormString: self new enabledWidget
andStoreWithName: 'enabled'
2 changes: 1 addition & 1 deletion ...ges/Material-Tests.package/MDPixelBasedTestCase.class/class/updateMouseEnterMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateMouseEnterMockObject

self
renderFormString: self new mouseEnterWidget
renderOnFormString: self new mouseEnterWidget
andStoreWithName: 'mouseEnter'
2 changes: 1 addition & 1 deletion ...l-Tests.package/MDPixelBasedTestCase.class/class/updateRippleMockObjectForScaleFactor..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ updateRippleMockObjectForScaleFactor: aNum
| widget |
widget := self new objectToTest.
self new performRippleSimulationOn: widget withScaleFactor: aNum.
self renderFormString: widget andStoreWithName: 'rippleWithFactor', (self printableFromScaleFactor: aNum)
self renderOnFormString: widget andStoreWithName: 'rippleWithFactor', (self printableFromScaleFactor: aNum)
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDPixelBasedTestCase.class/class/updateToggleOnMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateToggleOnMockObject

self
renderFormString: self new toggleOnWidget
renderOnFormString: self new toggleOnWidget
andStoreWithName: 'toggleOn'
18 changes: 9 additions & 9 deletions packages/Material-Tests.package/MDPixelBasedTestCase.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
"formComparisonColorExpectedValue" : "mats 6/19/2018 12:27",
"openForm:" : "mats 6/13/2018 10:42",
"printableFromScaleFactor:" : "mats 7/11/2018 19:40",
"renderFormString:andStoreWithName:" : "mats 6/13/2018 09:44",
"tests" : "LS 7/19/2018 15:40",
"renderOnFormString:andStoreWithName:" : "mats 7/25/2018 14:14",
"tests" : "mats 7/25/2018 14:14",
"updateAllMockObjects" : "LS 7/19/2018 16:45",
"updateAlternativeBackgroundColorMockObject" : "LS 7/19/2018 14:45",
"updateAlternativeTextMockObject" : "LS 7/19/2018 14:49",
"updateDisabledMockObject" : "LS 7/19/2018 14:46",
"updateEnabledMockObject" : "LS 7/19/2018 14:49",
"updateMouseEnterMockObject" : "LS 7/19/2018 16:45",
"updateRippleMockObjectForScaleFactor:" : "mats 7/11/2018 19:40",
"updateAlternativeBackgroundColorMockObject" : "mats 7/25/2018 14:16",
"updateAlternativeTextMockObject" : "mats 7/25/2018 14:16",
"updateDisabledMockObject" : "mats 7/25/2018 14:15",
"updateEnabledMockObject" : "mats 7/25/2018 14:16",
"updateMouseEnterMockObject" : "mats 7/25/2018 14:16",
"updateRippleMockObjectForScaleFactor:" : "mats 7/25/2018 14:16",
"updateRippleMockObjects" : "mats 7/11/2018 19:42",
"updateSubclassesMockObjects" : "LS 7/19/2018 14:54",
"updateToggleOnMockObject" : "LS 7/19/2018 14:48" },
"updateToggleOnMockObject" : "mats 7/25/2018 14:16" },
"instance" : {
"_testAlternativeBackgroundColor" : "LS 7/19/2018 14:15",
"_testAlternativeText" : "LS 7/19/2018 14:07",
Expand Down
4 changes: 2 additions & 2 deletions ...ringPerformanceTest.class/instance/_testAlternativeBackgroundColorRenderingPerformance.st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tests
_testAlternativeBackgroundColorRenderingPerformance

Transcript show: Character cr asString, 'Default Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #disabled) value: self enabledWidget
Transcript show: Character cr asString, 'Alternative Background Color Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #alternativeBackgroundColor) value: self alternativeBackgroundColorWidget
4 changes: 2 additions & 2 deletions ...age/MDRenderingPerformanceTest.class/instance/_testAlternativeTextRenderingPerformance.st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tests
_testAlternativeTextRenderingPerformance

Transcript show: Character cr asString, 'Default Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #disabled) value: self enabledWidget
Transcript show: Character cr asString, 'Alternative Text Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #alternativeText) value: self alternativeTextWidget
4 changes: 2 additions & 2 deletions ...ts.package/MDRenderingPerformanceTest.class/instance/_testDisabledRenderingPerformance.st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tests
_testDisabledRenderingPerformance

Transcript show: Character cr asString, 'Default Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #disabled) value: self enabledWidget
Transcript show: Character cr asString, 'Disabled Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #disabled) value: self disabledWidget
2 changes: 1 addition & 1 deletion ...sts.package/MDRenderingPerformanceTest.class/instance/_testEnabledRenderingPerformance.st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tests
_testEnabledRenderingPerformance

Transcript show: Character cr asString, 'Default Rendering Performance ', self class, Character cr.
Transcript show: Character cr asString, 'Enabled Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #enabled) value: self enabledWidget
4 changes: 2 additions & 2 deletions ....package/MDRenderingPerformanceTest.class/instance/_testMouseEnterRenderingPerformance.st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tests
_testMouseEnterRenderingPerformance

Transcript show: Character cr asString, 'Default Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #disabled) value: self enabledWidget
Transcript show: Character cr asString, 'Mouse Enter Rendering Performance ', self class, Character cr.
(self renderingPerformanceCheckBlockFor: #mouseEnter) value: self mouseEnterWidget
10 changes: 5 additions & 5 deletions packages/Material-Tests.package/MDRenderingPerformanceTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"renderingTimeUnit" : "CG 7/1/2018 12:20",
"renderingTimeUnit:" : "CG 7/1/2018 12:20" },
"instance" : {
"_testAlternativeBackgroundColorRenderingPerformance" : "LS 7/19/2018 17:00",
"_testAlternativeTextRenderingPerformance" : "LS 7/19/2018 17:00",
"_testDisabledRenderingPerformance" : "LS 7/19/2018 17:00",
"_testEnabledRenderingPerformance" : "LS 7/19/2018 17:00",
"_testMouseEnterRenderingPerformance" : "LS 7/19/2018 17:00",
"_testAlternativeBackgroundColorRenderingPerformance" : "mats 7/25/2018 14:32",
"_testAlternativeTextRenderingPerformance" : "mats 7/25/2018 14:35",
"_testDisabledRenderingPerformance" : "mats 7/25/2018 14:32",
"_testEnabledRenderingPerformance" : "mats 7/25/2018 14:33",
"_testMouseEnterRenderingPerformance" : "mats 7/25/2018 14:35",
"calculateMaxRenderingDurationForTest:forWidget:" : "mats 5/29/2018 17:57",
"render:times:" : "CG 6/30/2018 12:08",
"renderingPerformanceCheckBlockFor:" : "LS 7/19/2018 12:24" } }
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDTextFieldTest.class/class/updateActivatedMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateActivatedMockObject

self
renderFormString: self new widget activate
renderOnFormString: self new widget activate
andStoreWithName: 'activated'
2 changes: 1 addition & 1 deletion packages/Material-Tests.package/MDTextFieldTest.class/class/updateDeactivatedMockObject.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ mock object helper methods
updateDeactivatedMockObject

self
renderFormString: self classToTest new
renderOnFormString: self classToTest new
andStoreWithName: 'deactivated'
4 changes: 2 additions & 2 deletions packages/Material-Tests.package/MDTextFieldTest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"activated" : "LS 7/19/2018 16:45",
"classToTest" : "JW 6/16/2018 14:04",
"deactivated" : "LS 7/19/2018 16:45",
"updateActivatedMockObject" : "LS 7/19/2018 15:46",
"updateActivatedMockObject" : "mats 7/25/2018 14:16",
"updateAllMockObjects" : "JW 6/16/2018 14:04",
"updateDeactivatedMockObject" : "LS 7/19/2018 15:46" },
"updateDeactivatedMockObject" : "mats 7/25/2018 14:16" },
"instance" : {
"activatedAndDeactivatedWidget" : "LS 7/19/2018 16:28",
"activatedWidget" : "LS 7/19/2018 16:29",
Expand Down

0 comments on commit 3265df5

Please sign in to comment.