Merge branch 'master' of https://github.com/hpi-swa-teaching/SWT18-Pr…

…oject-09.git
hpi-swa-teaching · Jul 25, 2018 · 23802f4 · 23802f4
2 parents 5fe8472 + 6682edc
commit 23802f4
Show file tree

Hide file tree

Showing 27 changed files with 71 additions and 51 deletions.
diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st
@@ -0,0 +1,4 @@
+as yet unclassified
+createSlide 
+
+	^ self tool createSlide
diff --git a/...s/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st b/...s/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st
@@ -0,0 +1,4 @@
+as yet unclassified
+enablePresentationMode
+
+	self tool enablePresentationMode
diff --git a/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st b/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st
@@ -0,0 +1,4 @@
+as yet unclassified
+magneticRasterActive
+
+	^ self tool magneticRasterActive
diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st
@@ -0,0 +1,4 @@
+as yet unclassified
+selectSlideNumber: aNumber
+
+	self tool selectSlideNumber: aNumber
diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st
@@ -1,4 +1,4 @@
 slide deletion tests
 setUpSlideDeletion
 
-	self tool createSlide
+	self createSlide
diff --git a/...er-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st b/...er-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st
@@ -1,6 +1,6 @@
 miniature view tests
 testCurrentMiniatureHighlighted
 
-	5 timesRepeat: [self tool createSlide].
+	5 timesRepeat: [self createSlide].
 	self tool selectSlideNumber: 5.
 	self assert: self tool currentMiniature isHighlighted
diff --git a/...er-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st b/...er-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st
@@ -4,6 +4,6 @@ testDeletionDecreasesSlideCount
 	| slideCount |
 	self setUpSlideDeletion.
 
-	slideCount := self tool slideCount.
+	slideCount := self slideCount.
 	self deleteSlideAt: 1.
 	self assert: self slideCount equals: (slideCount - 1)
diff --git a/...senter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st b/...senter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st
@@ -2,8 +2,8 @@ slide creation tests
 testDuplicatedSlidesContent
 
 	| slide duplicatedSlide |
-	slide := self tool currentSlide.
+	slide := self currentSlide.
 	slide addContent: (Morph new center: slide center).
 	self tool duplicateCurrentSlide.
-	duplicatedSlide := self tool slideAt: self currentSlideNumber +1.
+	duplicatedSlide := self slideAt: self currentSlideNumber +1.
 	slide submorphs withIndexDo: [:each :index | self assert: each center equals: (duplicatedSlide submorphs at: index) center]
diff --git a/...esenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st b/...esenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st
@@ -2,4 +2,4 @@ slide creation tests
 testLayoutedSlidesCreation
 	"Assure that layout creation does not throw an error."
 	self tool slideLayoutNames values do: [:each | each value].
-	self assert: self tool slideCount equals: (self tool slideLayoutNames size + 1)
+	self assert: self slideCount equals: (self tool slideLayoutNames size + 1)
diff --git a/...Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st b/...Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st
@@ -1,14 +1,14 @@
 button tests
 testMagneticRasterButton
 
-	| button modeBefore|
+	| button modeBefore |
 	button := self window allMorphs detect: 
 		[:m | m externalName = (self tool magneticRasterButtonData at: #name)].
-	modeBefore := self tool magneticRasterActive.
+	modeBefore := self magneticRasterActive.
 
 	self click: MouseEvent redButton at: button boundsInWorld center.
-	self assert: self tool magneticRasterActive equals: modeBefore not.
+	self assert: self magneticRasterActive equals: modeBefore not.
 
 	self click: MouseEvent redButton at: button boundsInWorld center.
-	self assert: self tool magneticRasterActive equals: modeBefore.
+	self assert: self magneticRasterActive equals: modeBefore
 
diff --git a/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st b/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st
@@ -3,5 +3,5 @@ testMiniatureCreated
 
 	| oldSize |
 	oldSize := self tool slideMiniatures size.
-	self tool createSlide.
+	self createSlide.
 	self assert: self tool slideMiniatures size equals: oldSize + 1
diff --git a/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st b/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st
@@ -2,7 +2,7 @@ miniature view tests
 testMiniatureDeleted
 
 	| oldSize |
-	self tool createSlide.
+	self createSlide.
 	oldSize := self tool slideMiniatures size.
 	self tool deleteSlide.
 	self assert: self tool slideMiniatures size equals: oldSize - 1
diff --git a/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/...ges/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st
@@ -2,7 +2,7 @@ miniature view tests
 testMiniatureSelects
 
 	| slideToSelect miniatureToClick |
-	5 timesRepeat: [self tool createSlide].
+	5 timesRepeat: [self createSlide].
 
 	slideToSelect := self slides third.
 	miniatureToClick := self tool miniatureOf: slideToSelect.

diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st
@@ -2,7 +2,7 @@ slide moving tests
 testMoveSlide 
 
 	| slide |
-	4 timesRepeat: [self tool createSlide].	"=> 5 slides"
+	4 timesRepeat: [self createSlide].	"=> 5 slides"
 	slide := self slides first.
 
 	self tool selectSlideNumber: 1.

diff --git a/...Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st b/...Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st
@@ -2,7 +2,7 @@ slide moving tests
 testMoveSlideOutOfBounds
 
 	| slide |
-	4 timesRepeat: [self tool createSlide].	"=> 5 slides"
+	4 timesRepeat: [self createSlide].	"=> 5 slides"
 	slide := self slides first.
 
 	self tool selectSlideNumber: 1.

diff --git a/...ter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st b/...ter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st
@@ -2,7 +2,7 @@ slide moving tests
 testMovedSlideStayCurrentSlide
 
 	| slide |
-	4 timesRepeat: [self tool createSlide].	"=> 5 slides"
+	4 timesRepeat: [self createSlide].	"=> 5 slides"
 	slide := self slides first.
 
 	self tool selectSlideNumber: 1.

diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st
@@ -1,8 +1,8 @@
 slide navigation tests
 testNextSlide
 
-	self tool createSlide.
+	self createSlide.
 	self tool selectSlideNumber: 1.
-	self assert: self tool currentSlide = self slides first.
+	self assert: self currentSlide = self slides first.
 	self tool nextSlide.
-	self assert: self tool currentSlide = self slides second.
+	self assert: self currentSlide = self slides second
diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st
@@ -1,7 +1,7 @@
 slide navigation tests
 testSelectSlide
 
-	self tool createSlide.
+	self createSlide.
 	self tool selectSlideNumber: 1.
 	self assert: self currentSlide = self slides first.
 

diff --git a/...es/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/...es/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st
@@ -1,7 +1,7 @@
 slide navigation tests
 testSelectSlideClamps
 
-	self tool createSlide.
+	self createSlide.
 	self tool selectSlideNumber: 3.
 	self assert: self tool currentSlide = self slides last.
 

diff --git a/...enter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st b/...enter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st
@@ -2,7 +2,7 @@ miniature view tests
 testSelectedMiniatureChanges
 
 	| slide |
-	5 timesRepeat: [self tool createSlide].
+	5 timesRepeat: [self createSlide].
 	slide := self tool slideAt: 2.
 	self tool selectSlide: slide.
 	self assert: (self tool miniatureOf: slide) equals: self tool currentMiniature
diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st
@@ -3,7 +3,7 @@ testSlideCreation
 
 	| slideCount newSlide |
 	slideCount := self slideCount.
-	newSlide := self tool createSlide.
+	newSlide := self createSlide.
 	self assert: self slideCount equals: (slideCount + 1).
 	self assert: (self slides includes: newSlide)
 
diff --git a/...nter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st b/...nter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st
@@ -2,5 +2,5 @@ slide creation tests
 testSlideCreationReturnsSlide
 
 	| slide |
-	slide := self tool createSlide.
+	slide := self createSlide.
 	self assert: slide = self currentSlide
diff --git a/...r-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st b/...r-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st
@@ -2,5 +2,5 @@ slide creation tests
 testSlideCreationSelectsNewSlide
 
 	self assert: self currentSlide equals: self slides first.
-	self tool createSlide.
-	self assert: self currentSlide equals: self slides second.
+	self createSlide.
+	self assert: self currentSlide equals: self slides second
diff --git a/...ts.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st b/...ts.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st
@@ -1,7 +1,7 @@
 presentation mode tests
 testSlideNavigationInPresentationMode
 
-	self tool 
+	self 
 		createSlide;
 		selectSlideNumber: 1;
 		enablePresentationMode.

diff --git a/...sts.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st b/...sts.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st
@@ -3,7 +3,7 @@ testSlideNumberLabelSelectsCorrectly
 
 	| numberOfSlides index |
 	numberOfSlides := 5.
-	numberOfSlides timesRepeat: [self tool createSlide].
+	numberOfSlides timesRepeat: [self createSlide].
 
 	index := numberOfSlides atRandom.
 	self tool slideNumberString: index asString asText.

diff --git a/....package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st b/....package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st
@@ -1,7 +1,7 @@
 presentation mode tests
 testSlidesReceiveEnablePresentationMode
 
-	self tool createSlide.
+	self createSlide.
 	self slides: (self slides collect: [:each | PSMockSlide new]).
 	self tool enablePresentationMode.
 	self slides do: [:each |

diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json
@@ -2,59 +2,63 @@
 	"class" : {
 		 },
 	"instance" : {
+		"createSlide" : "MK 7/25/2018 13:10",
 		"currentSlide" : "WoC 7/24/2018 17:27",
 		"currentSlideNumber" : "WoC 7/24/2018 17:32",
 		"deleteSlideAt:" : "MK 7/25/2018 12:50",
+		"enablePresentationMode" : "MK 7/25/2018 13:07",
 		"expectedFailures" : "LB 7/24/2018 15:38",
+		"magneticRasterActive" : "MK 7/25/2018 12:57",
+		"selectSlideNumber:" : "MK 7/25/2018 13:09",
 		"setUp" : "LB 5/23/2018 16:11",
-		"setUpSlideDeletion" : "LM 7/24/2018 17:31",
+		"setUpSlideDeletion" : "MK 7/25/2018 13:00",
 		"slideAt:" : "MK 7/25/2018 12:48",
 		"slideContainer" : "WoC 6/15/2018 18:21",
 		"slideCount" : "WoC 7/24/2018 17:27",
 		"slides" : "LM 7/13/2018 17:42",
 		"slides:" : "LM 7/13/2018 18:22",
 		"tearDown" : "LB 5/22/2018 17:37",
 		"testBuildWith" : "WoC 7/24/2018 17:51",
-		"testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05",
+		"testCurrentMiniatureHighlighted" : "MK 7/25/2018 13:01",
 		"testDefaultSlideCount" : "MK 7/25/2018 12:49",
 		"testDeleteFirstSlide" : "MK 7/25/2018 12:51",
-		"testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:51",
+		"testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:53",
 		"testDeletionRemovesSlide" : "MK 7/25/2018 12:51",
 		"testDuplicateSlide" : "MK 7/25/2018 12:51",
-		"testDuplicatedSlidesContent" : "LB 7/24/2018 18:25",
+		"testDuplicatedSlidesContent" : "MK 7/25/2018 12:54",
 		"testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40",
-		"testLayoutedSlidesCreation" : "LB 7/24/2018 18:25",
+		"testLayoutedSlidesCreation" : "MK 7/25/2018 12:55",
 		"testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41",
 		"testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41",
 		"testLoadingProvidesWarning" : "LB 6/29/2018 19:38",
-		"testMagneticRasterButton" : "WoC 7/24/2018 17:47",
+		"testMagneticRasterButton" : "MK 7/25/2018 13:10",
 		"testMiniatureChangesIfSlideChanges" : "LB 7/24/2018 18:15",
-		"testMiniatureCreated" : "LB 6/29/2018 18:01",
-		"testMiniatureDeleted" : "LB 6/29/2018 18:02",
-		"testMiniatureSelects" : "WoC 7/24/2018 17:44",
-		"testMoveSlide" : "LB 6/29/2018 15:45",
-		"testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45",
-		"testMovedSlideStayCurrentSlide" : "WoC 7/24/2018 17:37",
-		"testNextSlide" : "LM 7/13/2018 17:52",
+		"testMiniatureCreated" : "MK 7/25/2018 13:01",
+		"testMiniatureDeleted" : "MK 7/25/2018 13:00",
+		"testMiniatureSelects" : "MK 7/25/2018 13:01",
+		"testMoveSlide" : "MK 7/25/2018 13:02",
+		"testMoveSlideOutOfBounds" : "MK 7/25/2018 13:02",
+		"testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:02",
+		"testNextSlide" : "MK 7/25/2018 13:03",
 		"testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12",
 		"testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42",
 		"testOccupiesWorldOnStep" : "LB 7/24/2018 16:48",
 		"testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36",
 		"testSavingShouldProvideWarning" : "LM 7/13/2018 18:40",
-		"testSelectSlide" : "WoC 7/24/2018 17:36",
-		"testSelectSlideClamps" : "WoC 7/24/2018 17:35",
-		"testSelectedMiniatureChanges" : "LB 6/29/2018 19:05",
+		"testSelectSlide" : "MK 7/25/2018 13:03",
+		"testSelectSlideClamps" : "MK 7/25/2018 13:03",
+		"testSelectedMiniatureChanges" : "MK 7/25/2018 13:03",
 		"testSlideContainerExtent" : "WoC 6/15/2018 18:51",
 		"testSlideContainerPosition" : "LB 7/24/2018 16:47",
-		"testSlideCreation" : "LB 7/24/2018 18:25",
-		"testSlideCreationReturnsSlide" : "WoC 7/24/2018 17:34",
-		"testSlideCreationSelectsNewSlide" : "LB 7/24/2018 18:26",
+		"testSlideCreation" : "MK 7/25/2018 13:04",
+		"testSlideCreationReturnsSlide" : "MK 7/25/2018 13:04",
+		"testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04",
 		"testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27",
-		"testSlideNavigationInPresentationMode" : "LB 7/24/2018 18:23",
-		"testSlideNumberLabelSelectsCorrectly" : "WoC 7/24/2018 17:32",
+		"testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:09",
+		"testSlideNumberLabelSelectsCorrectly" : "MK 7/25/2018 13:05",
 		"testSlideRatioIsFixed" : "WoC 7/24/2018 17:29",
 		"testSlideResizeRegression" : "WoC 7/24/2018 17:29",
-		"testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21",
+		"testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:05",
 		"testZeroSlidesRegression" : "LB 7/24/2018 18:28",
 		"testnextSlideClampsToMax" : "WoC 7/24/2018 17:29",
 		"tool" : "LM 5/16/2018 17:13",