P11 merge with model updates

DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st

@@ -189,6 +189,11 @@ DSSpyInstrumenterTest >> debuggerWithRunnableContext [
 		  initialize
 ]
 
+{ #category : 'helpers' }
+DSSpyInstrumenterTest >> execute1Halt [
+ 1 halt
+]
+
 { #category : 'helpers' }
 DSSpyInstrumenterTest >> executeHalt [ 
 
@@ -227,6 +232,18 @@ DSSpyInstrumenterTest >> metaPaneClassesItems: listName FromInspector: aMetaPane
 	^ (aMetaPane class slotNamed: listName) read: aMetaPane
 ]
 
+{ #category : 'helpers' }
+DSSpyInstrumenterTest >> methodWithDNU [
+
+	self unknownMessage
+]
+
+{ #category : 'helpers' }
+DSSpyInstrumenterTest >> methodWithException [
+
+	Exception new signal
+]
+
 { #category : 'helpers' }
 DSSpyInstrumenterTest >> newInspectorOn: anObject [
 
@@ -653,6 +670,14 @@ DSSpyInstrumenterTest >> testInstrumentHaltHits [
 	record := self registry fourth.
 	self assert: record selector equals: #now:.
 	self assertHaltHitRecordingMethod:  (self class >> #executeHaltWithMessage) conditional: false once: false.
+
+	[ self execute1Halt  ]
+		on: Halt
+		do: [  ].
+	self assert: self registry size equals: 5.
+	record := self registry fifth.
+	self assert: record selector equals: #halt.
+	self assertHaltHitRecordingMethod:  (self class >> #execute1Halt) conditional: false once: false.
 ]
 
 { #category : 'tests - halts' }
@@ -1316,3 +1341,42 @@ DSSpyInstrumenterTest >> testLoggingInteractionsWithNoSourceCode [
 			assert: record selectedString
 			equals: DSSpy recordSourceCodeDisabledErrorMessage ]
 ]
+
+{ #category : #'tests - exceptions' }
+DSSpyInstrumenterTest >> testRecordDNU [
+	|capturedDNU|
+
+	modifiedClass := Exception.
+	modifiedMethodSource := (Exception >> #raiseUnhandledError) sourceCode.
+	instrumenter instrumentExceptionSignalling.
+
+	[self methodWithDNU] on: MessageNotUnderstood do:[:dnu| capturedDNU := dnu. [dnu raiseUnhandledError] on: UnhandledError do:[] ].
+
+	record := self registry first.
+	self assert: record class equals: DSUnhandledExceptionRecord.
+	self assert: record exceptionClass equals: MessageNotUnderstood name.
+	self assert: record errorString equals: capturedDNU description.
+	self assert: record receiver equals: self class name.
+	self assert: record node equals: (self class>>#methodWithDNU) ast children first sourceCode.
+	self assert: record method equals: (self class>>#methodWithDNU) selector	
+]
+
+{ #category : #'tests - exceptions' }
+DSSpyInstrumenterTest >> testRecordException [
+	|capturedException|
+
+	modifiedClass := Exception.
+	modifiedMethodSource := (Exception >> #raiseUnhandledError) sourceCode.
+	instrumenter instrumentExceptionSignalling.
+
+	[self methodWithException] on: Exception do:[:e| capturedException := e copy. [e raiseUnhandledError] on: UnhandledError do:[] ].
+
+	self assert: self registry size equals: 1.
+	record := self registry first.
+	self assert: record class equals: DSUnhandledExceptionRecord.
+	self assert: record exceptionClass equals: Exception name.
+	self assert: record errorString equals: capturedException description.
+	self assert: record receiver equals: self class name.
+	self assert: record node equals: (self class>>#methodWithException) ast children first sourceCode.
+	self assert: record method equals: (self class>>#methodWithException) selector	
+]

DebuggingSpy-Tests/DSSpyTest.class.st

@@ -10,7 +10,8 @@ Class {
 		'breakpoint',
 		'task',
 		'survey',
-		'recordSourceCode'
+		'recordSourceCode',
+		'breakpointHash'
 	],
 	#category : 'DebuggingSpy-Tests',
 	#package : 'DebuggingSpy-Tests'
@@ -26,7 +27,8 @@ DSSpyTest >> assertBreakpointRecordedAs: aDSRecordClass forBreakpointEvent: aBre
 			  ifNotNil: [self assert: record objectCentric].
 	self deny: record once.
 	self assert: record method equals: self breakpointedMethod name.
-	self assert: record node equals: self breakpointedMethod ast printString
+	self assert: record node equals: self breakpointedMethod ast printString.
+	self assert: record breakpointHash equals: breakpointHash
 ]
 
 { #category : 'assertions' }
@@ -68,7 +70,8 @@ DSSpyTest >> assertVariableBreakpointRecordedAs: aDSRecordClass forBreakpointEve
 	self deny: record once.
 	self assert: record targetClassOrMethod equals: self breakpointedMethod name.
 	self assert: record targetVariables first equals: #value.
-	self assert: record accessStrategy equals: #all
+	self assert: record accessStrategy equals: #all.
+	self assert: record breakpointHash equals: breakpointHash
 ]
 
 { #category : 'assertions' }
@@ -114,15 +117,17 @@ DSSpyTest >> compileTestMethod [
 DSSpyTest >> installBreakpoint [
 
 	breakpoint := Breakpoint new node: self breakpointedMethod ast.
-	breakpoint install
+	breakpoint install.
+	breakpointHash := breakpoint hash
 ]
 
 { #category : 'helpers' }
 DSSpyTest >> installVariableBreakpoint [
 
 	breakpoint := VariableBreakpoint
 		              watchVariable: #value
-		              inClass: self breakpointedMethod
+		              inClass: self breakpointedMethod.
+	breakpointHash := breakpoint hash
 ]
 
 { #category : 'helpers' }
@@ -531,6 +536,7 @@ DSSpyTest >> testObjectCentricBreakpointRecord [
 	instrumenter listenToBreakpointChanges.
 
 	breakpoint := target haltOnCallTo: #breakpointMethod.
+	breakpointHash := breakpoint hash.
 	self assert: self registry size equals: 1.	
 	record := self registry first.
 	self
@@ -566,6 +572,7 @@ DSSpyTest >> testObjectCentricVariableBreakpointRecord [
 	breakpoint := (self breakpointedMethod newBreakpointForVariable: #value)
 		              scopeTo: target;
 		              install.
+	breakpointHash := breakpoint hash.
 
 	self assert: self registry size equals: 1.
 	record := self registry first.

DebuggingSpy/DSAbstractBreakpointEventRecord.class.st

@@ -9,18 +9,46 @@ Class {
 		'target',
 		'objectCentric',
 		'eventName',
-		'once'
+		'once',
+		'breakpointHash'
 	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
 	#tag : 'Records'
 }
 
+
+
+{ #category : 'converting' }
+DSAbstractBreakpointEventRecord >> asBreakpointRecord [
+
+	^ self modelClass
+		  perform: eventName asLowercase asSymbol asMutator
+		  with: self
+]
+
+{ #category : 'accessing' }
+DSAbstractBreakpointEventRecord >> breakpointHash [
+	^breakpointHash
+]
+
+{ #category : 'testing' }
+DSAbstractBreakpointEventRecord >> canOpenDebuggers [
+	^eventName = 'BreakpointHit'
+]
+
 { #category : 'accessing' }
 DSAbstractBreakpointEventRecord >> eventName [
 	^eventName
 ]
 
+
+{ #category : 'converting' }
+DSAbstractBreakpointEventRecord >> modelClass [
+
+	^ self subclassResponsibility
+]
+
 { #category : 'accessing' }
 DSAbstractBreakpointEventRecord >> objectCentric [
 
@@ -55,7 +83,8 @@ DSAbstractBreakpointEventRecord >> record: aBreakpointEvent [
 			          self printTargetInstance:
 				          aBreakpointEvent breakpoint targetInstance ]
 		          ifFalse: [ nil ].
-	once := aBreakpointEvent breakpoint once
+	once := aBreakpointEvent breakpoint once.
+	breakpointHash := aBreakpointEvent breakpoint hash
 ]
 
 { #category : 'accessing' }

DebuggingSpy/DSAbstractEventRecord.class.st

@@ -55,6 +55,13 @@ DSAbstractEventRecord >> >= aDSAbstractRecord [
 	^self dateTime >= aDSAbstractRecord dateTime
 ]
 
+
+{ #category : 'testing' }
+DSAbstractEventRecord >> canOpenDebuggers [
+
+	^ true
+]
+
 { #category : 'accessing' }
 DSAbstractEventRecord >> dateTime [
 
@@ -83,6 +90,11 @@ DSAbstractEventRecord >> printOn: aStream [
 	aStream << self eventName
 ]
 
+{ #category : 'accessing' }
+DSAbstractEventRecord >> realRecord [
+	^self
+]
+
 { #category : 'actions api' }
 DSAbstractEventRecord >> record: aWindow [
 	windowId := aWindow identityHash 
@@ -110,3 +122,8 @@ DSAbstractEventRecord >> windowId: anObject [
 
 	windowId := anObject
 ]
+
+{ #category : #accessing }
+DSAbstractEventRecord >> windowType [
+	^'Unknown Window'
+]

DebuggingSpy/DSAbstractExtendedRecord.class.st

@@ -0,0 +1,39 @@
+Class {
+	#name : #DSAbstractExtendedRecord,
+	#superclass : #DSAbstractEventRecord,
+	#instVars : [
+		'sourceRecord'
+	],
+	#category : #'DebuggingSpy-Records-Extensions'
+}
+
+{ #category : #'instance creation' }
+DSAbstractExtendedRecord class >> for: anObject [
+
+	^ self new
+		  record: anObject;
+		  yourself
+]
+
+{ #category : #'actions api' }
+DSAbstractExtendedRecord >> dateTime [
+
+	^ sourceRecord dateTime
+]
+
+{ #category : #accessing }
+DSAbstractExtendedRecord >> realRecord [
+
+	^ sourceRecord
+]
+
+{ #category : #'actions api' }
+DSAbstractExtendedRecord >> record: aSourceRecord [
+	sourceRecord := aSourceRecord 
+]
+
+{ #category : #'actions api' }
+DSAbstractExtendedRecord >> windowId [
+
+	^ sourceRecord windowId
+]

DebuggingSpy/DSBreakpointAdd.class.st

@@ -0,0 +1,10 @@
+Class {
+	#name : #DSBreakpointAdd,
+	#superclass : #DSMethodBreakpointRecord,
+	#category : #'DebuggingSpy-Records-Extensions'
+}
+
+{ #category : #'as yet unclassified' }
+DSBreakpointAdd >> eventSymbol [
+	^'+b'
+]

DebuggingSpy/DSBreakpointEventRecord.class.st

@@ -19,6 +19,12 @@ DSBreakpointEventRecord >> method [
 	^ method
 ]
 
+{ #category : 'converting' }
+DSBreakpointEventRecord >> modelClass [
+
+	^ DSMethodBreakpointRecord
+]
+
 { #category : 'accessing' }
 DSBreakpointEventRecord >> node [
 

DebuggingSpy/DSBreakpointHit.class.st

@@ -0,0 +1,10 @@
+Class {
+	#name : #DSBreakpointHit,
+	#superclass : #DSMethodBreakpointRecord,
+	#category : #'DebuggingSpy-Records-Extensions'
+}
+
+{ #category : #'as yet unclassified' }
+DSBreakpointHit >> eventSymbol [
+	^'*b'
+]

DebuggingSpy/DSBreakpointRecord.class.st

@@ -0,0 +1,75 @@
+Class {
+	#name : #DSBreakpointRecord,
+	#superclass : #DSAbstractExtendedRecord,
+	#category : #'DebuggingSpy-Records-Extensions'
+}
+
+{ #category : #accessing }
+DSBreakpointRecord >> breakpointHash [
+
+	^ sourceRecord breakpointHash
+]
+
+{ #category : #testing }
+DSBreakpointRecord >> canOpenDebuggers [
+
+	^ sourceRecord canOpenDebuggers
+]
+
+{ #category : #accessing }
+DSBreakpointRecord >> eventName [
+
+	^ sourceRecord eventName
+]
+
+{ #category : #'as yet unclassified' }
+DSBreakpointRecord >> eventSymbol [
+	^self subclassResponsibility
+]
+
+{ #category : #accessing }
+DSBreakpointRecord >> objectCentric [
+
+	^ sourceRecord objectCentric
+]
+
+{ #category : #accessing }
+DSBreakpointRecord >> once [
+
+	^ sourceRecord once
+]
+
+{ #category : #printing }
+DSBreakpointRecord >> printContextAndNode [
+
+	^ String streamContents: [ :s |
+		  | nodeStream peek |
+		  s << '['.
+		  s << self eventName.
+		  s << ']'.
+		  s space.
+		  s << self method]
+]
+
+{ #category : #printing }
+DSBreakpointRecord >> printTargetInstance: anObject [
+	^sourceRecord printTargetInstance: anObject
+]
+
+{ #category : #accessing }
+DSBreakpointRecord >> submethodTargets [
+
+	^ self subclassResponsibility
+]
+
+{ #category : #accessing }
+DSBreakpointRecord >> target [
+
+	^ sourceRecord target
+]
+
+{ #category : #accessing }
+DSBreakpointRecord >> targetClassOrMethod [
+
+	^ self subclassResponsibility
+]