onIdleEntered didn't handle nil session

Also, variables tab was broken in last commit (#040b78d6). Test cleanup.
GemTalk · Jan 8, 2019 · d170f11 · d170f11
1 parent 040b78d
commit d170f11
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/sources/JadeTranscript.cls b/sources/JadeTranscript.cls
@@ -124,12 +124,14 @@ onCloseRequested: boolValueHolder
 			temp forceLogout]!
 
 onIdleEntered
+	"gciSession might be nil on a fast moving test"
 
-	gciSession isCallInProgress ifFalse: [
-		Cursor current ifNotNil: [
-			[Cursor current ifNotNil: [Cursor current: nil]] forkAt: Processor userBackgroundPriority.
-		].
-	].
+	| shouldUpdateCursor |
+	shouldUpdateCursor := gciSession ifNil: [true] ifNotNil: [gciSession isCallInProgress not].
+	shouldUpdateCursor
+		ifTrue: 
+			[Cursor current
+				ifNotNil: [[Cursor current ifNotNil: [Cursor current: nil]] forkAt: Processor userBackgroundPriority]].
 	^super onIdleEntered!
 
 onViewOpened

diff --git a/sources/JadeiteDebuggerTestCase.cls b/sources/JadeiteDebuggerTestCase.cls
@@ -798,9 +798,10 @@ testUnsavedChangesActionChangeFrame
 	self assert: debugger frameListPresenter selectionByIndex equals: 4. 
 	debugger methodSourcePresenter documentPresenter value: 'new text'.
 	debugger methodSourcePresenter documentPresenter view isModified: true.
-	TestMessageBox plannedResult: #no.	"answer that we want to stay on frame"
+	TestMessageBox plannedResult: #no. "ignore changes"
 	self debuggerDo: [[debugger stepOver] forkAt: Processor activePriority + 1].
-	self assert: debugger frameListPresenter selectionByIndex equals: 4. ]
+	(Delay forMilliseconds: 50) wait. 
+	self assert: debugger frameListPresenter selectionByIndex equals: 1. ]
 			ensure: [TestMessageBox disableJadeiteTestMessageBox]!
 
 testUnsavedChangesActionChangeToHomeFrame

diff --git a/sources/JadeiteProjectBrowserTestCase.cls b/sources/JadeiteProjectBrowserTestCase.cls
@@ -384,7 +384,6 @@ test_blankCategoryRenameInvalid
 	TestMessageBox enableJadeiteTestMessageBox.
 	TestMessageBox plannedResult: #ok. 
 	[self projectsPresenter basicRenameCategoryFrom: 'accessing' to: String new.
-	self assert: self categoryListPresenter list size equals: 1.
 	self assert: self categoryListPresenter selection equals: 'accessing']
 		ensure: [TestMessageBox disableJadeiteTestMessageBox]!
 
@@ -2729,7 +2728,7 @@ test_twoBrowsersUpdateHierarchy
 test_UnsavedChangesActionChangeSelectionIgnoreChanges
 	self testsIssue: #issue388
 		withTitle: '(3.0.53) useful to be able to open method browser on selected methods in project browser'.
-
+	TestMessageBox enableJadeiteTestMessageBox.
 	[| source |
 	self selectServiceNamed: 'RowanSample1' in: self projectListPresenter.
 	self selectServiceNamed: 'RowanSample1-Core' in: self packageListPresenter.

diff --git a/sources/JadeiteProjectsBrowserPresenter.cls b/sources/JadeiteProjectsBrowserPresenter.cls
@@ -955,11 +955,11 @@ pkgsMenuStrings
 populateFilterList
 	self isCategoryTabSelected
 		ifTrue: 
-			[categoryListPresenter list: (ListModel new searchPolicy: SearchPolicy equality).
-			categoryListPresenter list addAll: self selectedClass categories]
+			[categoryListPresenter model: (ListModel new searchPolicy: SearchPolicy equality).
+			categoryListPresenter model addAll: self selectedClass categories]
 		ifFalse: 
-			[variableListPresenter list: (ListModel new searchPolicy: SearchPolicy equality).
-			variableListPresenter list addAll: self selectedClass categories]!
+			[variableListPresenter model: (ListModel new searchPolicy: SearchPolicy equality).
+			variableListPresenter model addAll: self selectedClass variables]!
 
 postOkToChangeEvent
 	| service |