Merge pull request #161 from hpi-swa-teaching/implement-#140

#140: Coverage improvements
hpi-swa-teaching · Aug 6, 2020 · 15ecd34 · 15ecd34
2 parents 5ffe3f5 + c4959db
commit 15ecd34
Show file tree

Hide file tree

Showing 55 changed files with 123 additions and 101 deletions.
diff --git a/packages/Algernon.package/ALGAction.class/class/validVerbs.st b/packages/Algernon.package/ALGAction.class/class/validVerbs.st
diff --git a/packages/Algernon.package/ALGAction.class/methodProperties.json b/packages/Algernon.package/ALGAction.class/methodProperties.json
@@ -1,7 +1,6 @@
 {
 	"class" : {
 		"createListOfAlgeractionsGiven:" : "J.J. 7/28/2015 19:16",
-		"validVerbs" : "rk 7/14/2020 10:06",
 		"withName:rank:target:selector:args:" : "J.J. 7/28/2015 19:15" },
 	"instance" : {
 		"actionVerb" : "beb 6/25/2020 10:17",

diff --git a/packages/Algernon.package/ALGActionItem.class/class/createFrom..st b/packages/Algernon.package/ALGActionItem.class/class/createFrom..st
@@ -3,8 +3,6 @@ createFrom: anAction
 
 	| item type |
 	type := ALGActionType newFor: anAction.
-	item := self new.
-	item algerType: type;
-		algerActions: (OrderedCollection newFrom: {anAction});
-		numTimesSelected: anAction numTimesSelected.
+	item := self withAlgertype: type.
+	item numTimesSelected: anAction numTimesSelected.
 	^ item
diff --git a/packages/Algernon.package/ALGActionItem.class/methodProperties.json b/packages/Algernon.package/ALGActionItem.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"createFrom:" : "beb 6/18/2020 17:02",
+		"createFrom:" : "jRo 8/5/2020 15:02",
 		"createListFrom:" : "beb 5/31/2020 18:26" },
 	"instance" : {
 		"name" : "td 6/8/2016 21:04",

diff --git a/packages/Algernon.package/ALGActionType.class/instance/createActionDo.st b/packages/Algernon.package/ALGActionType.class/instance/createActionDo.st
@@ -4,6 +4,6 @@ createActionDo
 	^ ALGAction
 			withName: 'do'
 			rank: 1
-			target: self
+			target: self action
 			selector: #do
 			args: OrderedCollection new
diff --git a/packages/Algernon.package/ALGActionType.class/methodProperties.json b/packages/Algernon.package/ALGActionType.class/methodProperties.json
@@ -4,7 +4,7 @@
 	"instance" : {
 		"action" : "J.J. 7/11/2015 18:24",
 		"action:" : "J.J. 7/30/2015 17:05",
-		"createActionDo" : "J.J. 7/30/2015 17:11",
+		"createActionDo" : "jRo 8/5/2020 15:07",
 		"createListOfAlgeractions" : "J.J. 7/30/2015 19:58",
 		"name" : "beb 5/21/2020 10:30",
 		"rankBonus" : "beb 7/1/2020 13:15",

diff --git a/packages/Algernon.package/ALGCache.class/instance/at..st b/packages/Algernon.package/ALGCache.class/instance/at..st
diff --git a/packages/Algernon.package/ALGCache.class/methodProperties.json b/packages/Algernon.package/ALGCache.class/methodProperties.json
@@ -6,7 +6,6 @@
 		"allMatchedItems:" : "beb 7/2/2020 15:04",
 		"allMatchedItemsAt:" : "beb 7/2/2020 15:05",
 		"allMatchedItemsAt:put:" : "beb 7/2/2020 17:16",
-		"at:" : "beb 7/2/2020 15:04",
 		"clear" : "beb 7/2/2020 17:00",
 		"emptyResult" : "beb 7/2/2020 15:14",
 		"finalResults" : "beb 7/2/2020 15:04",

diff --git a/packages/Algernon.package/ALGCategoryType.class/instance/open.inBrowser..st b/packages/Algernon.package/ALGCategoryType.class/instance/open.inBrowser..st
@@ -1,4 +1,4 @@
 actions
 open: aCategory inBrowser: aBrowser
 
-	aBrowser systemCategoryListIndex: (aBrowser systemCategoryList indexOf: aCategory)
+	aBrowser selectSystemCategory: aCategory
diff --git a/packages/Algernon.package/ALGCategoryType.class/methodProperties.json b/packages/Algernon.package/ALGCategoryType.class/methodProperties.json
@@ -8,5 +8,5 @@
 		"createActionFileoutFor:" : "J.J. 7/30/2015 17:38",
 		"createListOfAlgeractions" : "JS 6/21/2016 23:14",
 		"hasChildren" : "fw 7/30/2015 14:18",
-		"open:inBrowser:" : "J.J. 7/30/2015 17:15",
+		"open:inBrowser:" : "jRo 8/5/2020 15:43",
 		"typeName" : "J.J. 7/30/2015 17:15" } }
diff --git a/packages/Algernon.package/ALGClassCommentFuzzyMatcher.class/class/computeScore.given..st b/packages/Algernon.package/ALGClassCommentFuzzyMatcher.class/class/computeScore.given..st
@@ -5,4 +5,5 @@ computeScore: anItem given: aQueryString
 	anItem algerType hasComment ifFalse: [ ^ nil ].
 	score := self scoreBetween: aQueryString and: anItem algerType comment.
 	score ifNil: [ ^ nil ].
+
 	^ score negated + self classCommentFuzzyPenalty
diff --git a/packages/Algernon.package/ALGClassCommentFuzzyMatcher.class/methodProperties.json b/packages/Algernon.package/ALGClassCommentFuzzyMatcher.class/methodProperties.json
@@ -3,6 +3,6 @@
 		"afterPenalty" : "beb 8/1/2020 10:16",
 		"beforePenalty" : "beb 8/1/2020 10:15",
 		"classCommentFuzzyPenalty" : "beb 8/1/2020 10:15",
-		"computeScore:given:" : "rk 8/3/2020 16:45" },
+		"computeScore:given:" : "jRo 8/5/2020 16:26" },
 	"instance" : {
 		 } }
diff --git a/packages/Algernon.package/ALGCore.class/class/setKeyboardBinding..st b/packages/Algernon.package/ALGCore.class/class/setKeyboardBinding..st
@@ -1,5 +1,4 @@
 preferences
-setKeyboardBinding: aString
+setKeyboardBinding: aString 
 	self activationString: aString.
-	^true
-
+	^ true
diff --git a/packages/Algernon.package/ALGCore.class/class/setKeyboardBinding.st b/packages/Algernon.package/ALGCore.class/class/setKeyboardBinding.st
@@ -4,6 +4,6 @@ setKeyboardBinding
 		category: #Algernon
 		description: 'Set the keyboard shortcut  to open Algernon.'
 		type: #String>
-		^self activationString
+		^ self activationString
 
 
diff --git a/packages/Algernon.package/ALGCore.class/instance/deactivate..st b/packages/Algernon.package/ALGCore.class/instance/deactivate..st
@@ -6,4 +6,5 @@ deactivate: hand
 		 reset;
 		 stopStepping;
 		 hideMorphs.
+	hand ifNotNil: [self dropFocus: hand].
 	ALGInstallation instance cleanupIfNewDay.
diff --git a/packages/Algernon.package/ALGCore.class/instance/dropFocus..st b/packages/Algernon.package/ALGCore.class/instance/dropFocus..st
@@ -0,0 +1,6 @@
+events-processing
+dropFocus: hand
+	hand newKeyboardFocus: self oldKeyboardFocus;
+		newMouseFocus: self oldMouseFocus.
+	self oldKeyboardFocus: nil;
+		oldMouseFocus: nil
diff --git a/packages/Algernon.package/ALGCore.class/instance/systemChanged..st b/packages/Algernon.package/ALGCore.class/instance/systemChanged..st
@@ -1,3 +1,3 @@
 updating
 systemChanged: evt
-	self unsubscribeFromNotifiers.
+	self wasChanged: evt
diff --git a/packages/Algernon.package/ALGCore.class/methodProperties.json b/packages/Algernon.package/ALGCore.class/methodProperties.json
@@ -17,9 +17,9 @@
 		"initializeAlgernon" : "mt 10/20/2015 14:32:03",
 		"initializeGlobalKeyBindings" : "jRo 7/13/2020 15:29",
 		"keyBindings" : "J.J. 7/31/2015 20:31",
-		"open" : "LK 5/12/2016 20:45",
-		"setKeyboardBinding" : "AKK 5/11/2016 17:35",
-		"setKeyboardBinding:" : "AKK 5/11/2016 17:42",
+		"open" : "jRo 8/5/2020 15:17",
+		"setKeyboardBinding" : "jRo 8/5/2020 15:56",
+		"setKeyboardBinding:" : "jRo 8/5/2020 15:55",
 		"title" : "J.J. 7/28/2015 19:29" },
 	"instance" : {
 		"activate" : "beb 6/29/2020 09:17",
@@ -37,9 +37,10 @@
 		"createInputHelper" : "J.J. 7/30/2015 19:40",
 		"currentItem" : "J.J. 7/30/2015 20:25",
 		"deactivate" : "topa 3/24/2015 14:11",
-		"deactivate:" : "jRo 8/1/2020 19:06",
+		"deactivate:" : "jRo 8/5/2020 15:10",
 		"delete" : "beb 7/16/2020 10:12",
 		"doActionOnSelectedEvent:" : "jRo 8/1/2020 19:32",
+		"dropFocus:" : "jRo 8/6/2020 11:13",
 		"filteringThreshold" : "DS 5/21/2017 16:54",
 		"firstOnSearchStack" : "jRo 6/14/2020 18:21",
 		"firstStep:" : "DS 5/21/2017 16:43",
@@ -97,7 +98,7 @@
 		"showParentList" : "jRo 8/1/2020 13:28",
 		"step" : "DS 6/2/2017 15:01",
 		"stepTime" : "DS 5/21/2017 16:53",
-		"systemChanged:" : "beb 7/15/2020 16:15",
+		"systemChanged:" : "jRo 8/5/2020 16:47",
 		"textField" : "J.J. 7/27/2015 21:10",
 		"textField:" : "J.J. 7/27/2015 21:10",
 		"toggleVisibility:" : "JF 5/7/2015 14:35",

diff --git a/packages/Algernon.package/ALGIconFactory.class/class/iconNames.st b/packages/Algernon.package/ALGIconFactory.class/class/iconNames.st
diff --git a/packages/Algernon.package/ALGIconFactory.class/methodProperties.json b/packages/Algernon.package/ALGIconFactory.class/methodProperties.json
@@ -9,7 +9,6 @@
 		"globalVariableIcon" : "fw 7/21/2015 22:02",
 		"helpIcon" : "beb 5/20/2020 17:42",
 		"iconFor:" : "jRo 5/31/2020 15:35",
-		"iconNames" : "jRo 8/1/2020 11:04",
 		"iconSize" : "J.J. 7/30/2015 15:07",
 		"iconSizeItemType" : "jRo 5/31/2020 15:16",
 		"initializeFileMapping" : "rk 7/15/2020 16:02",

diff --git a/packages/Algernon.package/ALGInputField.class/instance/wouldAcceptKeyboardFocusUponTab.st b/packages/Algernon.package/ALGInputField.class/instance/wouldAcceptKeyboardFocusUponTab.st
@@ -1,3 +1,3 @@
 accessing
 wouldAcceptKeyboardFocusUponTab
-	^false
+	^ false
diff --git a/packages/Algernon.package/ALGInputField.class/methodProperties.json b/packages/Algernon.package/ALGInputField.class/methodProperties.json
@@ -18,4 +18,4 @@
 		"moveCursorToEnd" : "rk 6/17/2020 14:00",
 		"normalKeyStroke:" : "jRo 7/13/2020 15:33",
 		"size" : "beb 5/23/2020 16:04",
-		"wouldAcceptKeyboardFocusUponTab" : "jRo 7/13/2020 15:26" } }
+		"wouldAcceptKeyboardFocusUponTab" : "jRo 8/5/2020 16:20" } }
diff --git a/packages/Algernon.package/ALGItem.class/class/add.toDict.atValue..st b/packages/Algernon.package/ALGItem.class/class/add.toDict.atValue..st
diff --git a/packages/Algernon.package/ALGItem.class/class/withAlgertype..st b/packages/Algernon.package/ALGItem.class/class/withAlgertype..st
@@ -1,3 +1,3 @@
 instance creation
 withAlgertype: aType
-	^ (ALGItem new) updateAlgertype: aType
+	^ (self new) updateAlgertype: aType
diff --git a/packages/Algernon.package/ALGItem.class/class/withAlgertype.relevantForEmptyString..st b/packages/Algernon.package/ALGItem.class/class/withAlgertype.relevantForEmptyString..st
diff --git a/packages/Algernon.package/ALGItem.class/instance/numTimesSelected..st b/packages/Algernon.package/ALGItem.class/instance/numTimesSelected..st
@@ -1,4 +1,5 @@
 accessing
 numTimesSelected: anInt
 	numTimesSelected := anInt.
-	self lastUsage: DateAndTime now
+	self lastUsage: DateAndTime now
+
diff --git a/packages/Algernon.package/ALGItem.class/instance/rank.st b/packages/Algernon.package/ALGItem.class/instance/rank.st
@@ -2,4 +2,5 @@ accessing
 rank
 	| timeStampFactor |
 	timeStampFactor := 1 / (((DateAndTime now - self lastUsage) asSeconds) + 1).
-	^ self rankBonus +  (self numTimesSelected + 1) + (timeStampFactor * self numTimesSelected) squared
+	^ self rankBonus +  (self numTimesSelected + 1) + (timeStampFactor * self numTimesSelected) squared
+
diff --git a/packages/Algernon.package/ALGItem.class/methodProperties.json b/packages/Algernon.package/ALGItem.class/methodProperties.json
@@ -1,8 +1,6 @@
 {
 	"class" : {
-		"add:toDict:atValue:" : "LK 6/1/2016 22:00",
-		"withAlgertype:" : "rk 8/3/2020 16:46",
-		"withAlgertype:relevantForEmptyString:" : "beb 6/30/2020 10:45" },
+		"withAlgertype:" : "jRo 8/5/2020 15:01" },
 	"instance" : {
 		"algerActions" : "td 6/8/2016 21:04",
 		"algerActions:" : "td 6/8/2016 21:04",
@@ -28,16 +26,16 @@
 		"isLessThan:given:" : "td 6/29/2016 08:20",
 		"isLessThan:or:given:" : "pw 8/4/2020 10:26",
 		"isRelevantForAllStrings" : "beb 6/25/2020 10:11",
-		"lastUsage" : "rk 8/4/2020 21:05",
-		"lastUsage:" : "rk 8/4/2020 21:05",
-		"lowerCaseName" : "rk 8/4/2020 21:02",
+		"lastUsage" : "jRo 8/5/2020 15:31",
+		"lastUsage:" : "jRo 8/5/2020 15:31",
+		"lowerCaseName" : "beb 5/21/2020 10:28",
 		"matchesAction:" : "beb 6/18/2020 17:52",
 		"name" : "jRo 5/28/2020 19:53",
 		"nameLessThan:given:" : "pw 8/5/2020 09:11",
-		"numTimesSelected" : "rk 8/4/2020 21:02",
-		"numTimesSelected:" : "rk 8/4/2020 21:08",
+		"numTimesSelected" : "jRo 6/14/2020 01:19",
+		"numTimesSelected:" : "jRo 8/5/2020 15:32",
 		"printOn:" : "J.J. 7/30/2015 15:34",
-		"rank" : "rk 8/4/2020 21:09",
+		"rank" : "jRo 8/5/2020 15:28",
 		"rankBonus" : "beb 7/1/2020 13:14",
 		"rankLessThan:" : "pw 8/3/2020 23:56",
 		"resetDefaultIndex" : "beb 7/31/2020 17:27",

diff --git a/packages/Algernon.package/ALGItemFilter.class/class/classCommentFuzzyPenalty.st b/packages/Algernon.package/ALGItemFilter.class/class/classCommentFuzzyPenalty.st
diff --git a/packages/Algernon.package/ALGItemFilter.class/methodProperties.json b/packages/Algernon.package/ALGItemFilter.class/methodProperties.json
@@ -1,6 +1,5 @@
 {
 	"class" : {
-		"classCommentFuzzyPenalty" : "beb 7/3/2020 13:42",
 		"helpTexts" : "beb 5/20/2020 15:39",
 		"keywords" : "beb 6/30/2020 11:59" },
 	"instance" : {

diff --git a/packages/Algernon.package/ALGItemProvider.class/class/reset.st b/packages/Algernon.package/ALGItemProvider.class/class/reset.st
diff --git a/packages/Algernon.package/ALGItemProvider.class/methodProperties.json b/packages/Algernon.package/ALGItemProvider.class/methodProperties.json
@@ -5,7 +5,6 @@
 		"initializeItems" : "rk 7/15/2020 15:58",
 		"minimumItemsToCompute" : "beb 6/30/2020 19:47",
 		"newIn:" : "J.J. 7/30/2015 22:00",
-		"reset" : "J.J. 7/27/2015 17:29",
 		"searchDelimeter" : "J.J. 7/28/2015 17:11" },
 	"instance" : {
 		"cache" : "beb 7/16/2020 10:21",

diff --git a/packages/Algernon.package/ALGResultList.class/instance/cleanUp.st b/packages/Algernon.package/ALGResultList.class/instance/cleanUp.st
diff --git a/packages/Algernon.package/ALGResultList.class/methodProperties.json b/packages/Algernon.package/ALGResultList.class/methodProperties.json
@@ -10,7 +10,6 @@
 		"add:target:selector:argumentList:" : "jRo 8/1/2020 01:18",
 		"addAll:" : "beb 8/1/2020 13:45",
 		"addCategory:" : "rk 8/4/2020 21:29",
-		"cleanUp" : "beb 7/14/2020 09:10",
 		"controller" : "rk 8/3/2020 16:48",
 		"controller:" : "rk 8/4/2020 21:29",
 		"doActionOnSelectedItem:" : "jRo 8/1/2020 19:33",

diff --git a/packages/AlgernonTests.package/ALGTest.class/instance/getResultItemForType..st b/packages/AlgernonTests.package/ALGTest.class/instance/getResultItemForType..st
@@ -1,3 +1,3 @@
 helpers
 getResultItemForType: aTypeString
-	self items detect: [:eachItem | eachItem typeName = aTypeString]
+	self items detect: [:eachItem | eachItem algerType typeName = aTypeString]
diff --git a/packages/AlgernonTests.package/ALGTest.class/instance/previousAlgernonSingleton..st b/packages/AlgernonTests.package/ALGTest.class/instance/previousAlgernonSingleton..st
@@ -0,0 +1,3 @@
+accessing
+previousAlgernonSingleton: anObject
+	previousAlgernonSingleton := anObject
diff --git a/packages/AlgernonTests.package/ALGTest.class/instance/previousAlgernonSingleton.st b/packages/AlgernonTests.package/ALGTest.class/instance/previousAlgernonSingleton.st
@@ -0,0 +1,3 @@
+accessing
+previousAlgernonSingleton
+	^ previousAlgernonSingleton
diff --git a/packages/AlgernonTests.package/ALGTest.class/instance/setUp.st b/packages/AlgernonTests.package/ALGTest.class/instance/setUp.st
@@ -1,5 +1,7 @@
 running
 setUp
+	self previousAlgernonSingleton: Algernon currentInstance.
+	Algernon currentInstance: self algInstance.
 	ClassOrganizer allInstancesDo: [:ea | ea removeEmptyCategories].
 	self previouslyOpenedWindows: self currentSystemWindows.
 	self algInstance activate.
diff --git a/packages/AlgernonTests.package/ALGTest.class/instance/tearDown.st b/packages/AlgernonTests.package/ALGTest.class/instance/tearDown.st
@@ -1,5 +1,6 @@
 running
 tearDown
-	self algInstance deactivate: nil.
+	self algInstance deactivate.
 	(self currentSystemWindows difference: self previouslyOpenedWindows)
-		do: [:each | each delete]
+		do: [:each | each delete].
+	Algernon currentInstance: self previousAlgernonSingleton.
diff --git a/packages/AlgernonTests.package/ALGTest.class/methodProperties.json b/packages/AlgernonTests.package/ALGTest.class/methodProperties.json
@@ -21,13 +21,15 @@
 		"ensureMorphic" : "rk 8/4/2020 20:39",
 		"findNewSystemWindowsByLabel:old:" : "jRo 5/27/2020 17:44",
 		"findSystemWindowsByLabel:" : "jRo 6/4/2020 15:08",
-		"getResultItemForType:" : "jRo 5/27/2020 15:44",
+		"getResultItemForType:" : "jRo 8/5/2020 16:37",
 		"isMorphic" : "rk 8/4/2020 20:40",
 		"itemMorphs" : "jRo 8/1/2020 11:39",
 		"itemProviderSearch:" : "jRo 8/1/2020 11:23",
 		"items" : "jRo 8/1/2020 11:40",
 		"moveCursorTo:" : "jRo 7/5/2020 22:15",
 		"nameOfFirstResult" : "pw 7/8/2020 21:41",
+		"previousAlgernonSingleton" : "jRo 8/6/2020 10:59",
+		"previousAlgernonSingleton:" : "jRo 8/6/2020 10:59",
 		"previouslyOpenedWindows" : "jRo 7/2/2020 10:52",
 		"previouslyOpenedWindows:" : "jRo 7/2/2020 10:52",
 		"resultsClassIncludeName:" : "jRo 8/1/2020 11:51",

diff --git a/packages/AlgernonTests.package/ALGTest.class/properties.json b/packages/AlgernonTests.package/ALGTest.class/properties.json
@@ -7,7 +7,9 @@
 		"LastResetSeconds" ],
 	"commentStamp" : "JS 7/12/2016 10:56",
 	"instvars" : [
-		"previouslyOpenedWindows" ],
+		"algerInstance",
+		"previouslyOpenedWindows",
+		"previousAlgernonSingleton" ],
 	"name" : "ALGTest",
 	"pools" : [
 		 ],

diff --git a/...ages/AlgernonTests.package/ALGTestLifecycle.class/instance/testAlgernonChangeShortcut..st b/...ages/AlgernonTests.package/ALGTestLifecycle.class/instance/testAlgernonChangeShortcut..st
@@ -1,6 +1,6 @@
 testing
 testAlgernonChangeShortcut: shortcut 
-	ALGCore activationString: shortcut shallowCopy.
+	ALGCore setKeyboardBinding: shortcut copy.
 	self algInstance deactivate: nil.
 	self deny: self algInstance active.
 	self algInstance handleListenEvent: (ALGFakeKeyboardEvent new keyString: shortcut shallowCopy;

diff --git a/packages/AlgernonTests.package/ALGTestLifecycle.class/instance/testAlgernonClose.st b/packages/AlgernonTests.package/ALGTestLifecycle.class/instance/testAlgernonClose.st