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

…oject-09.git
hpi-swa-teaching · Jul 25, 2018 · 7b76265 · 7b76265
2 parents 94ade93 + 23802f4
commit 7b76265
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 21 deletions.
diff --git a/...ter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st b/...ter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st
@@ -6,6 +6,5 @@ testCanLoadEmptyPresentation
 	self loader loadPresentationUnchecked: directory.
 	errorReport := self loader errorReport.
 	self
-		assert: (errorReport values select: [:each | each = 0]) size 
-		equals: (directory / self loader slidesDirectoryName) directoryNames size
+		assert: (errorReport values select: [:each | each ~= 0]) isEmpty
 		description: 'There should be 0 errors per slide for an empty presentation'
diff --git a/.../Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st b/.../Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st
@@ -4,5 +4,4 @@ testCanLoadEmptySlide
 	| directory |
 	directory := PSMockFileDirectory named: 'slide'.
 	self 
-		assert: 0
-	 	equals: (self loader loadSlideFromDirectory: directory) submorphs size 
+		assert: (self loader loadSlideFromDirectory: directory) submorphs isEmpty
diff --git a/...ter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/...ter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st
@@ -6,7 +6,8 @@ testLoadCompletePresentation
 	presentation := PSPresentationLoader new
 		world: self world;
 		loadPresentationFromDirectory: directory.
-	self assert: presentation slideCount equals: 3.
-	self assert: presentation slides first submorphs size equals: 1.
-	self assert: presentation slides second submorphs isEmpty.
-	self assert: presentation slides third submorphs size equals: 2
+	self 
+		assert: presentation slideCount equals: 3;
+		assert: presentation slides first submorphs size equals: 1;
+		assert: presentation slides second submorphs isEmpty;
+		assert: presentation slides third submorphs size equals: 2
diff --git a/...s/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st b/...s/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st
@@ -5,5 +5,6 @@ testMorphLoadIsValid
 	morph := self loader 
 		loadMorphFromStream: (self morphLoadingStreamFor: self validMorphFileData)
 		testIn: self world.
-	self assert: morph notNil.
-	self assert: morph class equals: PSContentContainer
+	self 
+		assert: morph notNil;
+		assert: morph class equals: PSContentContainer
diff --git a/...ges/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st b/...ges/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st
@@ -1,5 +1,6 @@
 presentation loading
 testSortMorphFiles
 
-	self assert: {'2.morph' . '3.morph' . '4.morph'} 
+	self 
+		assert: {'2.morph' . '3.morph' . '4.morph'} 
 		equals: (self loader sortedMorphFiles: {'4.morph' . '2.morph' . '3.morph'})
diff --git a/...ges/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st b/...ges/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st
diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json
@@ -8,17 +8,17 @@
 		"mockEmptyPresentationDirectory" : "LB 7/24/2018 17:33",
 		"morphLoadingStreamFor:" : "MK 7/20/2018 15:48",
 		"setUp" : "MK 7/20/2018 15:46",
-		"testCanLoadEmptyPresentation" : "MK 7/20/2018 15:49",
-		"testCanLoadEmptySlide" : "MK 7/20/2018 15:48",
+		"testCanLoadEmptyPresentation" : "LM 7/25/2018 13:09",
+		"testCanLoadEmptySlide" : "LM 7/25/2018 13:10",
 		"testEmptyPresentationDirectoryIsValid" : "MK 7/20/2018 15:50",
 		"testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51",
 		"testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51",
 		"testInvalidSlideDirectoryNames" : "LB 7/24/2018 17:35",
-		"testLoadCompletePresentation" : "LB 7/24/2018 17:41",
+		"testLoadCompletePresentation" : "LM 7/25/2018 13:12",
 		"testMissingSlidesDirectory" : "LB 7/24/2018 17:39",
-		"testMorphLoadIsValid" : "LB 7/24/2018 17:44",
+		"testMorphLoadIsValid" : "LM 7/25/2018 13:14",
 		"testMorphNameIsNotNumber" : "LB 7/24/2018 17:39",
 		"testMorphNameIsNumber" : "LB 7/24/2018 17:39",
 		"testSlidesDirectoryIsEmpty" : "LB 7/24/2018 17:39",
-		"testSortMorphFiles" : "LB 7/24/2018 17:46",
-		"validMorphFileData" : "LB 7/24/2018 17:47" } }
+		"testSortMorphFiles" : "LM 7/25/2018 13:14",
+		"validMorphFileData" : "LM 7/25/2018 13:14" } }
diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st
@@ -1,5 +1,6 @@
 context menu tests
 testContextMenu
 
-	self assertContextMenuContent: self textField equals: 
-		(self textField owner defaultContextMenuContent, self textField customContextMenuContent)
+	self 
+		assertContextMenuContent: self textField 
+		equals: (self textField owner defaultContextMenuContent, self textField customContextMenuContent)
diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"setUp" : "LB 6/1/2018 18:12",
 		"tearDown" : "LB 6/1/2018 18:21",
 		"testBackgroundColorDialog" : "LM 7/25/2018 11:35",
-		"testContextMenu" : "MK 7/25/2018 11:33",
+		"testContextMenu" : "LM 7/25/2018 13:07",
 		"testFontColorDialog" : "LM 7/25/2018 11:34",
 		"testFontSizeDialog" : "MK 7/13/2018 18:10",
 		"testLocalFontColor" : "JZ 7/25/2018 11:41",