Merge branch 'development' into equation-solving

hpi-swa-teaching · Jun 17, 2022 · 08c643e · 08c643e
2 parents cb83319 + 442118c
commit 08c643e
Show file tree

Hide file tree

Showing 34 changed files with 184 additions and 8 deletions.
diff --git a/packages/Algernon.package/ALGGitProjectType.class/README.md b/packages/Algernon.package/ALGGitProjectType.class/README.md
diff --git a/packages/Algernon.package/ALGGitProjectType.class/class/algertemList.st b/packages/Algernon.package/ALGGitProjectType.class/class/algertemList.st
@@ -0,0 +1,8 @@
+as yet unclassified
+algertemList
+
+	(Smalltalk classNamed: #SquitBrowser) ifNil:
+		[^ {}].
+
+	^ SquotWorkingCopy registered
+			collect: [ :each | ALGItem withAlgertype: (self with: each) ]
diff --git a/packages/Algernon.package/ALGGitProjectType.class/class/icon.st b/packages/Algernon.package/ALGGitProjectType.class/class/icon.st
@@ -0,0 +1,4 @@
+as yet unclassified
+icon
+
+	^ #GitProject
diff --git a/packages/Algernon.package/ALGGitProjectType.class/instance/algertemChildrenList.st b/packages/Algernon.package/ALGGitProjectType.class/instance/algertemChildrenList.st
@@ -0,0 +1,4 @@
+children
+algertemChildrenList
+
+	^ {}
diff --git a/packages/Algernon.package/ALGGitProjectType.class/instance/createActionOpenInGitBrowser.st b/packages/Algernon.package/ALGGitProjectType.class/instance/createActionOpenInGitBrowser.st
@@ -0,0 +1,11 @@
+actions
+createActionOpenInGitBrowser
+
+	^ ALGAction
+			withName: 'open'
+			rank: 5
+			target: self
+			selector: #openGitBrowser
+			args: OrderedCollection new
+
+
diff --git a/packages/Algernon.package/ALGGitProjectType.class/instance/createListOfAlgeractions.st b/packages/Algernon.package/ALGGitProjectType.class/instance/createListOfAlgeractions.st
@@ -0,0 +1,5 @@
+actions
+createListOfAlgeractions
+
+	^ self createSortedListFrom: {
+		self createActionOpenInGitBrowser }
diff --git a/packages/Algernon.package/ALGGitProjectType.class/instance/hasChildren.st b/packages/Algernon.package/ALGGitProjectType.class/instance/hasChildren.st
@@ -0,0 +1,4 @@
+children
+hasChildren
+
+	^ true
diff --git a/packages/Algernon.package/ALGGitProjectType.class/instance/openGitBrowser.st b/packages/Algernon.package/ALGGitProjectType.class/instance/openGitBrowser.st
@@ -0,0 +1,9 @@
+actions
+openGitBrowser
+
+	| squitBrowser |
+
+	squitBrowser := SquitBrowser new.
+	squitBrowser projectIndex: (squitBrowser projectList indexOf: self typeObject).
+
+	ToolBuilder open: squitBrowser
diff --git a/packages/Algernon.package/ALGGitProjectType.class/instance/typeName.st b/packages/Algernon.package/ALGGitProjectType.class/instance/typeName.st
@@ -0,0 +1,4 @@
+accessing
+typeName
+
+	^ 'Git Project'
diff --git a/packages/Algernon.package/ALGGitProjectType.class/methodProperties.json b/packages/Algernon.package/ALGGitProjectType.class/methodProperties.json
@@ -0,0 +1,11 @@
+{
+	"class" : {
+		"algertemList" : "LH 6/11/2022 22:08",
+		"icon" : "LH 5/28/2022 19:21" },
+	"instance" : {
+		"algertemChildrenList" : "LH 5/31/2022 18:06",
+		"createActionOpenInGitBrowser" : "LH 6/8/2022 16:19",
+		"createListOfAlgeractions" : "LH 5/31/2022 02:20",
+		"hasChildren" : "LH 5/31/2022 18:05",
+		"openGitBrowser" : "LH 5/31/2022 02:42",
+		"typeName" : "LH 5/28/2022 19:44" } }
diff --git a/packages/Algernon.package/ALGGitProjectType.class/properties.json b/packages/Algernon.package/ALGGitProjectType.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Algernon",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"action" ],
+	"name" : "ALGGitProjectType",
+	"pools" : [
+		 ],
+	"super" : "ALGType",
+	"type" : "normal" }
diff --git a/packages/Algernon.package/ALGIconFactory.class/class/initializeFileMapping.st b/packages/Algernon.package/ALGIconFactory.class/class/initializeFileMapping.st
@@ -25,4 +25,5 @@ initializeFileMapping
 		#Project -> self projectIcon.
 		#Do -> self doIcon.
 		#Squeak -> self squeakIcon.
+		#GitProject -> self repositoryIcon
 	}
diff --git a/packages/Algernon.package/ALGIconFactory.class/methodProperties.json b/packages/Algernon.package/ALGIconFactory.class/methodProperties.json
@@ -13,7 +13,7 @@
 		"iconFor:" : "NL 6/4/2021 14:14",
 		"iconSize" : "J.J. 7/30/2015 15:07",
 		"iconSizeItemType" : "jRo 5/31/2020 15:16",
-		"initializeFileMapping" : "b 7/31/2021 12:33",
+		"initializeFileMapping" : "LH 5/31/2022 17:42",
 		"methodIcon" : "fw 7/21/2015 22:02",
 		"morphIcon" : "fw 7/21/2015 22:02",
 		"packageIcon" : "fw 7/21/2015 22:02",

diff --git a/packages/Algernon.package/ALGItemProvider.class/class/initializeItems.st b/packages/Algernon.package/ALGItemProvider.class/class/initializeItems.st
@@ -12,4 +12,5 @@ initializeItems
 		addAll: ALGClassType algertemList;
 		addAll: ALGMethodType algertemList;
 		addAll: ALGWindowOperationsType algertemList;
+		addAll: ALGGitProjectType algertemList;
 		yourself
diff --git a/packages/Algernon.package/ALGItemProvider.class/class/resetItems.st b/packages/Algernon.package/ALGItemProvider.class/class/resetItems.st
@@ -0,0 +1,4 @@
+accessing
+resetItems
+
+	DefaultItems := nil
diff --git a/packages/Algernon.package/ALGItemProvider.class/methodProperties.json b/packages/Algernon.package/ALGItemProvider.class/methodProperties.json
@@ -3,9 +3,10 @@
 		"defaultItems" : "J.J. 7/27/2015 17:37",
 		"defaultSearchLevel" : "OH 5/20/2021 13:59",
 		"filters" : "beb 5/20/2020 17:57",
-		"initializeItems" : "NL 7/6/2021 11:59",
+		"initializeItems" : "LH 5/31/2022 01:15",
 		"maximumItemsToCompute" : "b 5/28/2021 15:43",
 		"newIn:" : "J.J. 7/30/2015 22:00",
+		"resetItems" : "LH 5/31/2022 01:00",
 		"searchDelimeter" : "J.J. 7/28/2015 17:11" },
 	"instance" : {
 		"cache" : "beb 7/16/2020 10:21",

diff --git a/packages/AlgernonTests.package/ALGLinting.class/instance/collectTestObjects.st b/packages/AlgernonTests.package/ALGLinting.class/instance/collectTestObjects.st
@@ -3,4 +3,6 @@ collectTestObjects
 	| classes |
 	classes := SystemNavigation default allClasses.
 	classes := classes select: [ :each | each class category beginsWith: 'Algernon' ].
+	(Smalltalk classNamed:	#SquitBrowser) ifNil:
+		[classes := classes difference: {ALGGitProjectType . ALGTestGitProjectType}].
 	^ classes collect: [ :each | each as: SLTestObject ].
diff --git a/packages/AlgernonTests.package/ALGLinting.class/methodProperties.json b/packages/AlgernonTests.package/ALGLinting.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"collectTestObjects" : "YD 5/18/2022 00:40",
+		"collectTestObjects" : "LH 6/12/2022 02:24",
 		"defaultTimeout" : "pw 7/12/2020 21:15",
 		"evaluateClassTests:" : "YD 5/18/2022 00:07",
 		"evaluateMethodTest:" : "YD 5/18/2022 00:13",

diff --git a/packages/AlgernonTests.package/ALGTest.class/instance/tearDown.st b/packages/AlgernonTests.package/ALGTest.class/instance/tearDown.st
@@ -1,8 +1,8 @@
 running
 tearDown
 	self algInstance deactivate.
-	self algInstance delete.
 	(self currentSystemWindows difference: self previouslyOpenedWindows)
 		do: [:each | each delete].
-	self restorePreferences.
-	Algernon currentInstance: self previousAlgernonSingleton.
+	ALGCore allInstances do: [:each | each delete].
+	Algernon currentInstance: self previousAlgernonSingleton.
+	self restorePreferences
diff --git a/packages/AlgernonTests.package/ALGTest.class/methodProperties.json b/packages/AlgernonTests.package/ALGTest.class/methodProperties.json
@@ -50,6 +50,6 @@
 		"runQuery:withCursorAt:" : "rk 8/5/2020 19:27",
 		"setUp" : "b 8/3/2021 11:32",
 		"storePreferences" : "b 8/3/2021 11:24",
-		"tearDown" : "b 8/3/2021 11:14",
+		"tearDown" : "ga 6/3/2022 12:08",
 		"topResults" : "rk 8/3/2020 16:52",
 		"typeNameOfFirstResult" : "rk 7/16/2020 10:14" } }
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/README.md b/packages/AlgernonTests.package/ALGTestGitProjectType.class/README.md
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/expectedFailures.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/expectedFailures.st
@@ -0,0 +1,7 @@
+helpers
+expectedFailures
+
+	(Smalltalk classNamed:	#SquitBrowser) ifNil:
+		[^ ALGTestGitProjectType methodsInCategory: #testing].
+
+	^ {}
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/mockWorkingCopy..st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/mockWorkingCopy..st
@@ -0,0 +1,3 @@
+accessing
+mockWorkingCopy: anObject
+	mockWorkingCopy := anObject
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/mockWorkingCopy.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/mockWorkingCopy.st
@@ -0,0 +1,3 @@
+accessing
+mockWorkingCopy
+	^ mockWorkingCopy
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/setUp.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/setUp.st
@@ -0,0 +1,9 @@
+helpers
+setUp
+
+	(Smalltalk classNamed: #SquitBrowser) ifNotNil:
+		[self setUpTestWorkingCopy].
+
+	super setUp.
+
+	ALGItemProvider resetItems
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/setUpTestWorkingCopy.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/setUpTestWorkingCopy.st
@@ -0,0 +1,13 @@
+helpers
+setUpTestWorkingCopy
+
+	| workingCopy |
+	workingCopy := SquotWorkingCopy newOnObjectMemory.
+	workingCopy name: 'Test Working Copy'.
+	workingCopy repository: (SquitRepository new initializeInDirectory: FileSystem memory root).
+	workingCopy repository unitOfWork activateDuring:
+		[workingCopy loadedHistorian: (workingCopy repository historianNamed: 'master')].
+	workingCopy register.
+	self mockWorkingCopy: workingCopy.
+
+	ALGItemProvider resetItems
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/tearDown.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/tearDown.st
@@ -0,0 +1,7 @@
+helpers
+tearDown
+
+	(Smalltalk classNamed: #SquitBrowser) ifNotNil:
+		[self tearDownTestWorkingCopy].
+
+	super tearDown
diff --git a/...ges/AlgernonTests.package/ALGTestGitProjectType.class/instance/tearDownTestWorkingCopy.st b/...ges/AlgernonTests.package/ALGTestGitProjectType.class/instance/tearDownTestWorkingCopy.st
@@ -0,0 +1,5 @@
+helpers
+tearDownTestWorkingCopy
+
+	SquotWorkingCopy unregister: self mockWorkingCopy.
+	self mockWorkingCopy: nil
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/testGitProjectOpen.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/testGitProjectOpen.st
@@ -0,0 +1,9 @@
+testing
+testGitProjectOpen
+
+	self assert:
+		[self runQuery: 'Test Working Copy'.
+		 self activateCurrentItemAction.
+		 World doOneCycle.
+		 World doOneCycle]
+		opensNewWindow: 'Git Browser: Test Working Copy (master)'
diff --git a/...s/AlgernonTests.package/ALGTestGitProjectType.class/instance/testGitProjectTypeAppears.st b/...s/AlgernonTests.package/ALGTestGitProjectType.class/instance/testGitProjectTypeAppears.st
@@ -0,0 +1,5 @@
+testing
+testGitProjectTypeAppears
+
+	self runQuery: 'Test Working Copy'.
+	self deny: (self getResultItemForType: 'Git Project') isNil
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/testHasChildren.st b/packages/AlgernonTests.package/ALGTestGitProjectType.class/instance/testHasChildren.st
@@ -0,0 +1,4 @@
+testing
+testHasChildren
+
+	self assert: ALGGitProjectType algertemList first hasChildren
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/methodProperties.json b/packages/AlgernonTests.package/ALGTestGitProjectType.class/methodProperties.json
@@ -0,0 +1,14 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"expectedFailures" : "LH 6/12/2022 00:59",
+		"mockWorkingCopy" : "LH 6/12/2022 00:09",
+		"mockWorkingCopy:" : "LH 6/12/2022 00:09",
+		"setUp" : "LH 6/12/2022 01:00",
+		"setUpTestWorkingCopy" : "LH 6/12/2022 00:11",
+		"tearDown" : "LH 6/12/2022 00:59",
+		"tearDownTestWorkingCopy" : "LH 6/12/2022 00:48",
+		"testGitProjectOpen" : "LH 6/12/2022 00:04",
+		"testGitProjectTypeAppears" : "LH 6/12/2022 00:05",
+		"testHasChildren" : "LH 6/12/2022 00:07" } }
diff --git a/packages/AlgernonTests.package/ALGTestGitProjectType.class/properties.json b/packages/AlgernonTests.package/ALGTestGitProjectType.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "AlgernonTests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"mockWorkingCopy" ],
+	"name" : "ALGTestGitProjectType",
+	"pools" : [
+		 ],
+	"super" : "ALGTestTypes",
+	"type" : "normal" }
diff --git a/packages/AlgernonTests.package/ALGTestTypes.class/methodProperties.json b/packages/AlgernonTests.package/ALGTestTypes.class/methodProperties.json
@@ -50,7 +50,7 @@
 		"testExpressionWithChildren" : "b 8/5/2021 17:36",
 		"testFindsNewDockingBarEntries" : "b 8/5/2021 17:20",
 		"testGlobalVariableNotEmpty" : "rk 8/6/2020 10:51",
-		"testHasChildren" : "ms 6/9/2022 09:53",
+		"testHasChildren" : "LH 6/12/2022 00:07",
 		"testHelpAction" : "8/6/2020 11:41:26",
 		"testHelpAlgerItems" : "rk 8/6/2020 10:51",
 		"testIsEquation" : "ms 6/9/2022 09:40",