Fix more tests

Author: guillep

src/NewTools-Debugger-Tests/StDebuggerInspectorTest.class.st

@@ -141,11 +141,11 @@ StDebuggerInspectorTest >> testUpdateLayoutForContextsWithAssertionFailure [
 	self
 		assert: assertionFailure actualObject
 		equals:
-		((session interruptedContext tempNamed: #aStringOrBlock) at: 2).
+		((session interruptedContext tempNamed: #aStringOrBlock) at: 1).
 	self
 		assert: assertionFailure expectedObject
 		equals:
-		((session interruptedContext tempNamed: #aStringOrBlock) at: 1)
+		((session interruptedContext tempNamed: #aStringOrBlock) at: 2)
 ]
 
 { #category : 'tests' }

src/NewTools-Debugger-Tests/StDebuggerTest.class.st

@@ -330,7 +330,7 @@ StDebuggerTest >> testContextChangedAfterStepOverAndReturn [
 { #category : 'tests - context inspector' }
 StDebuggerTest >> testContextTempVarList [
 	| contextItems inspectorTable |
-	
+
 	dbg := self debuggerOn: session.
 	inspectorTable := dbg inspector getRawInspectorPresenterOrNil attributeTable.
 
@@ -342,10 +342,10 @@ StDebuggerTest >> testContextTempVarList [
 	self assert: (contextItems at: 1) class equals: StInspectorSelfNode.	
 
 	"Next nodes are temps"
-	self assert: (contextItems at: 2) tempVariable isTempVariable.
-	self assert: (contextItems at: 3) tempVariable isTempVariable.
-	self assert: (contextItems at: 4) tempVariable isTempVariable.
-	self assert: (contextItems at: 5) tempVariable isTempVariable.
+	self assert: (contextItems at: 2) isTempVariable.
+	self assert: (contextItems at: 3) isTempVariable.
+	self assert: (contextItems at: 4) isTempVariable.
+	self assert: (contextItems at: 5) isTempVariable.
 
 	"receiver"	
 	self assert: (contextItems at: 6) rawValue identicalTo: session shortStack first receiver session.
@@ -413,8 +413,8 @@ StDebuggerTest >> testContextTempVarListUpdatesTempsWhenEnteringOrLeavingInlined
 			assert: (newContextItems at: i)
 			identicalTo: (contextItems at: i) ].
 
-	self assert: (newContextItems at: 9) tempVariable isTempVariable.
-	self assert: (newContextItems at: 9) tempVariable name equals: 'j'.
+	self assert: (newContextItems at: 9) isTempVariable.
+	self assert: (newContextItems at: 9) tempName equals: 'j'.
 
 	"We leave inlined block"
 	2 timesRepeat: [ dbg stepOver ].
@@ -620,7 +620,6 @@ StDebuggerTest >> testDiscardCodeChangesFor [
 { #category : 'tests - code pane' }
 StDebuggerTest >> testDynamicVariableEvaluation [
 	|activeProcess debuggedProcess|
-	self skipOnPharoCITestingEnvironment.
 	debugger := StTestDebuggerProvider new
 		            debuggerWithDynamicVariableSuspendedContext.
 	debugger initializeCode.
@@ -1307,11 +1306,11 @@ StDebuggerTest >> testUpdateLayoutForContextsIfAssertionFailure [
 	self
 		assert: assertionFailure actualObject
 		equals:
-		((session interruptedContext tempNamed: #aStringOrBlock) at: 2).
+		((session interruptedContext tempNamed: #aStringOrBlock) at: 1).
 	self
 		assert: assertionFailure expectedObject
 		equals:
-		((session interruptedContext tempNamed: #aStringOrBlock) at: 1)
+		((session interruptedContext tempNamed: #aStringOrBlock) at: 2)
 ]
 
 { #category : 'tests - code pane' }

src/NewTools-Debugger-Tests/StTestDebuggerProvider.class.st

@@ -41,22 +41,25 @@ StTestDebuggerProvider >> debuggerWithDNUContext [
 
 { #category : 'helpers' }
 StTestDebuggerProvider >> debuggerWithDynamicVariableSuspendedContext [
-	|process|
+
+	| process progressSemaphore |
+	progressSemaphore := Semaphore new.
 	process := [
-	           TestDynamicVariable value: 42 during: [
-		           self assert:
-			           (thisProcess psValueAt: TestDynamicVariable soleInstance index) = 42.
-					  100 milliSeconds wait.
-		           thisProcess suspend ] ] fork.
-	session := DebugSession
-		           named: 'test session providerSessionFor:'
-		           on: process
-		           startedAt: process suspendedContext.
-	session exception:
-		(OupsNullException fromSignallerContext: process suspendedContext).
-"	self assert:
-		(process psValueAt: TestDynamicVariable soleInstance index) = 42."
+		           TestDynamicVariable value: 42 during: [
+				           self assert: (thisProcess psValueAt: TestDynamicVariable soleInstance index) = 42.
+				           "Let's tell our owner that we are inside the block!"
+							  progressSemaphore signal.
+							  "And now we suspend ourselves"
+				           thisProcess suspend ] ] fork.
 
+	"We wait until the process reaches the block.
+	Then we can continue"
+	progressSemaphore wait.
+
+	session := DebugSession named: 'test session providerSessionFor:' on: process startedAt: process suspendedContext.
+	session exception: (OupsNullException fromSignallerContext: process suspendedContext).
+	self assert: (process psValueAt: TestDynamicVariable soleInstance index) = 42.
+
 	^ self newDebugger
 ]
 

src/NewTools-Debugger/StDebugger.class.st

@@ -847,7 +847,6 @@ StDebugger >> initializeInspector [
 	inspector := self
 		instantiate: self debuggerInspectorClass
 		on: (self debuggerInspectorModelClass on: self newDebuggerContext).
-	namesVisibleInPreviousScope := self newDebuggerContext context temporaryVariableNames.
 	inspector label: 'Receiver'
 ]
 
@@ -1556,8 +1555,7 @@ StDebugger >> updateInspectorFromContext: aContext [
 		isAssertionFailure:
 		self debuggerActionModel isInterruptedContextAnAssertEqualsFailure.
 	inspector updateWith: (self newDebuggerContextFor: aContext).
-	self flag: #DBG_INSPECTOR_UPDATE_BUG.
-	inspector getRawInspectorPresenterOrNil ifNotNil: [ :p | p update ]
+	self updateStep
 ]
 
 { #category : 'updating' }