From 11e058a5956faa2af8220a4519e3a849803e8f6f Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Tue, 24 Feb 2026 10:30:41 +0100
Subject: [PATCH 1/2] fix: browser tests and git rebase

---
 .../DSRecordBrowserTest.class.st              | 42 ++++++++--
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 84 +++++++++++--------
 .../DSRecorderWindow.class.st                 |  2 +-
 DebuggingSpy/DSSTONFileLogger.class.st        |  6 ++
 DebuggingSpy/DSSpyInstrumenter.class.st       |  3 +
 5 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index fa117c6..1669749 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -19,11 +19,10 @@ DSRecordBrowserTest >> filesPresenter [
 DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
 
 	| recordFileRef records |
-	recordFileRef := logger ensureCreateLoggingFileReference.
-	Transcript
-		show: recordFileRef;
-		cr.
+	browser startRecording.
+	recordFileRef := self updateLoggerFileName.
 	records := OrderedCollection new.
+
 	1 to: aNumberOfRecords do: [ :i |
 			records add: (DSMouseEnterWindowRecord new
 					 windowId: 'test' , i asString;
@@ -47,6 +46,8 @@ DSRecordBrowserTest >> setUp [
 	DSSpy testingSession: true.
 
 	logger := DSSpy logger loggingDirectory: self temporaryDirectory.
+	self updateLoggerFileName.
+
 	browser := DSRecordBrowser new
 ]
 
@@ -54,6 +55,7 @@ DSRecordBrowserTest >> setUp [
 DSRecordBrowserTest >> tearDown [
 
 	DSRecordRegistry current reset.
+	browser stopRecording.
 
 	super tearDown
 ]
@@ -113,17 +115,33 @@ DSRecordBrowserTest >> testGetHistoryOf [
 	self assert: (DSRecordBrowser getHistoryOf: fileRef) records size equals: 5
 ]
 
+{ #category : 'tests' }
+DSRecordBrowserTest >> testRemoveFile [
+
+	| fileRef1 fileRef2 |
+	fileRef1 := self generateRecordFile: 42.
+	fileRef2 := self generateRecordFile: 42.
+
+	browser addFile: fileRef1.
+	browser addFile: fileRef2.
+	browser removeFile: fileRef1.
+
+	self assert: browser files size equals: 1.
+	self assert: self filesPresenter items size equals: 1.
+	self assert: self filesPresenter selectedItem equals: fileRef2
+]
+
 { #category : 'tests' }
 DSRecordBrowserTest >> testStartRecording [
 
 	self assert: browser recorderWindow isNil.
+	self deny: DSRecordRegistry autoSerialize.
 	self deny: DSSpy recordingSession.
 
 	browser startRecording.
 	self assert: DSSpy recordingSession.
+	self assert: DSRecordRegistry autoSerialize.
 	self deny: browser recorderWindow isNil.
-
-	browser stopRecording
 ]
 
 { #category : 'helpers' }
@@ -137,3 +155,15 @@ DSRecordBrowserTest >> toolbarPresenter [
 
 	^ browser presenterAt: #toolbar
 ]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> updateLoggerFileName [
+	"Changes the logging file name, needs to be called everytime a new file is created for the logger to be updated for future logs.
+Using a UUID ensures that multiple files created at the same date and time dont have the same file name."
+
+	| fr |
+	logger loggingFileName: UUID new asString.
+	fr := logger ensureCreateLoggingFileReference.
+	logger loggingFileReference: fr.
+	^ fr
+]
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 375f187..ada4041 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -19,12 +19,18 @@ Class {
 		'recordsFilter'
 	],
 	#classInstVars : [
-		'presenterWindow'
+		'presenter'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
 }
 
+{ #category : 'accessing' }
+DSRecordBrowser class >> browser [
+
+	^ presenter ifNil: [ presenter := self new ]
+]
+
 { #category : 'color' }
 DSRecordBrowser class >> getColoredRecordsOf: aWindowRecordCollection [
 
@@ -83,40 +89,24 @@ DSRecordBrowser class >> menuCommandOn: aBuilder [
 		action: [ self toggleBrowser ]
 ]
 
-{ #category : 'accessing' }
-DSRecordBrowser class >> presenterWindow [
-
-	^ presenterWindow
-]
-
-{ #category : 'accessing' }
-DSRecordBrowser class >> presenterWindow: aWindow [
-
-	presenterWindow := aWindow
-]
-
 { #category : 'initialization' }
 DSRecordBrowser class >> resetBrowser [
 
 	<script>
-	presenterWindow := nil
+	presenter := nil
 ]
 
 { #category : 'open/close' }
 DSRecordBrowser class >> toggleBrowser [
 
-	| presenter |
-	presenterWindow ifNotNil: [
-			^ presenterWindow isOpen
-				  ifTrue: [ presenterWindow close ]
-				  ifFalse: [ presenterWindow open ] ].
-
-	presenter := self new.
-	presenter open.
-	presenterWindow := presenter window
+	presenter ifNotNil: [
+			^ presenter window isOpen
+				  ifTrue: [ presenter window close ]
+				  ifFalse: [ presenter window open ] ].
+	self browser open
 ]
 
-{ #category : 'adding' }
+{ #category : 'files' }
 DSRecordBrowser >> addFile: aFileReference [
 	"Adds a file in the presenter and set is as selected, which updates the records displayed."
 
@@ -144,9 +134,8 @@ DSRecordBrowser >> connectPresenters [
 	"Updates the records and the timeline whenever the selected file is changed."
 
 	addedFilesPresenter whenSelectionChangedDo: [ :presenter |
-			presenter selectedItem ifNotNil: [
-					self updateSelectedRecords: presenter.
-					self updateTimelineChart ] ].
+			self updateSelectedRecords: presenter.
+			self updateTimelineChart ].
 
 	recordsFilter whenChangedDo: [
 			addedFilesPresenter selectedItem ifNotNil: [
@@ -215,15 +204,24 @@ DSRecordBrowser >> listAddedFilesActions [
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect';
+					  iconName: #inspect;
 					  description: 'Inspect the raw records';
 					  shortcutKey: $i meta;
 					  action: [ (DSSpy materialize: addedFilesPresenter selectedItem) inspect ] ];
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect history';
+					  iconName: #history;
 					  description: 'Inspect the record history';
 					  shortcutKey: $h meta;
 					  action: [ (self class getHistoryOf: addedFilesPresenter selectedItem) inspect ] ];
+		  addActionWith: [ :anItem |
+				  anItem
+					  name: 'Remove';
+					  iconName: #remove;
+					  description: 'Remove the record from list';
+					  shortcutKey: $x meta;
+					  action: [ self removeFile: addedFilesPresenter selectedItem ] ];
 		  yourself
 ]
 
@@ -234,6 +232,7 @@ DSRecordBrowser >> listRecordActions [
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect';
+					  iconName: #inspect;
 					  description: 'Inspect the raw records';
 					  shortcutKey: $i meta;
 					  action: [ selectedRecordsPresenter selectedItem record inspect ] ];
@@ -291,6 +290,16 @@ DSRecordBrowser >> recordsTable [
 		  yourself
 ]
 
+{ #category : 'files' }
+DSRecordBrowser >> removeFile: aFileReference [
+
+	files := files reject: [ :fileReference | fileReference = aFileReference ].
+	addedFilesPresenter items: self files.
+	addedFilesPresenter selectItem: (files isEmpty
+			 ifTrue: [ nil ]
+			 ifFalse: [ files last ])
+]
+
 { #category : 'initialization' }
 DSRecordBrowser >> resetBrowser [
 
@@ -313,13 +322,13 @@ DSRecordBrowser >> startRecordButton [
 DSRecordBrowser >> startRecording [
 	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
 
-	DSSpyInstrumenter instrumentSystem.
 	(toolbar leftItems at: 2) enabled: false. "Disable the start recording button."
 	(toolbar leftItems at: 3) enabled: true. "Enable the stop recording button."
 	recorderWindow := DSRecorderWindow new.
 	recorderWindow
 		openInWorld;
-		startTimer
+		startTimer.
+	DSSpyInstrumenter instrumentSystem
 ]
 
 { #category : 'layout' }
@@ -341,8 +350,9 @@ DSRecordBrowser >> stopRecording [
 	DSSpyInstrumenter stopInstrumentation.
 	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
 	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
-	recorderWindow stopTimer.
-	self currentWorld removeMorph: recorderWindow
+	recorderWindow ifNotNil: [
+			recorderWindow stopTimer.
+			self currentWorld removeMorph: recorderWindow ]
 ]
 
 { #category : 'layout' }
@@ -355,8 +365,8 @@ DSRecordBrowser >> timelineChart [
 	names := history windows collect: [ :i | i getWindowType ].
 
 	data := self class getTimelinePointsFrom: history.
-	data size < 2 ifTrue: [^ nil].
-	
+	data size < 2 ifTrue: [ ^ nil ].
+
 	chart := RSCompositeChart new.
 	chart addAll: data.
 
@@ -377,8 +387,10 @@ DSRecordBrowser >> updateSelectedRecords: aPresenter [
 	"Updates the selected records and processes it to be used with their respective colors."
 
 	| records |
-	records := self class getColoredRecordsOf: (self class getHistoryOf: aPresenter selectedItem) windows.
-	records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ].
+	records := OrderedCollection new.
+	aPresenter selectedItem ifNotNil: [
+			records := self class getColoredRecordsOf: (self class getHistoryOf: aPresenter selectedItem) windows.
+			records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ] ].
 	selectedRecords := records.
 	selectedRecordsPresenter
 		roots: selectedRecords;
@@ -390,7 +402,7 @@ DSRecordBrowser >> updateTimelineChart [
 
 	| chart |
 	chart := self timelineChart.
-	chart ifNotNil: [ timeline script: [ :canvas | chart renderIn: canvas ] ].
+	chart ifNil: [ timeline script: [ :canvas |  ] ] ifNotNil: [ timeline script: [ :canvas | chart renderIn: canvas ] ].
 	timeline refresh
 ]
 
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
index fa72b85..f9c054f 100644
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -35,7 +35,7 @@ DSRecorderWindow >> buildUI [
 
 	stopButton := PluggableButtonMorph new
 		              label: (IconicListItemMorph new icon: (self iconNamed: #stop));
-		              model: DSRecordBrowser presenterWindow presenter;
+		              model: DSRecordBrowser browser;
 		              actionSelector: #stopRecording;
 		              position: 125 @ 4;
 		              yourself.
diff --git a/DebuggingSpy/DSSTONFileLogger.class.st b/DebuggingSpy/DSSTONFileLogger.class.st
index 778d287..c43d04a 100644
--- a/DebuggingSpy/DSSTONFileLogger.class.st
+++ b/DebuggingSpy/DSSTONFileLogger.class.st
@@ -93,6 +93,12 @@ DSSTONFileLogger >> loggingFileReference [
 		  loggingFileReference := self ensureCreateLoggingFileReference ]
 ]
 
+{ #category : 'accessing' }
+DSSTONFileLogger >> loggingFileReference: aFileReference [
+
+	^ loggingFileReference := aFileReference
+]
+
 { #category : 'initialization' }
 DSSTONFileLogger >> reset [
 
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 14407d3..f2879db 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -23,6 +23,9 @@ DSSpyInstrumenter class >> stopInstrumentation [
 
 	"Stop the recording session"
 	DSSpy recordingSession: false.
+	
+	"Stop the auto serialization"
+	DSRecordRegistry autoSerialize: false.
 
 	"Stop listening to events for recording"
 	SystemAnnouncer uniqueInstance unsubscribe: DSSpy.

From 9fd34a518d3278a94e33de51adcc74b294f9866e Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Tue, 24 Feb 2026 10:41:59 +0100
Subject: [PATCH 2/2] fix: recorder window was opened but never closed in tests

---
 DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st | 5 +++--
 DebuggingSpy-Browser/DSRecordBrowser.class.st           | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index 1669749..21a75ae 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -19,7 +19,8 @@ DSRecordBrowserTest >> filesPresenter [
 DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
 
 	| recordFileRef records |
-	browser startRecording.
+	DSSpy recordingSession ifFalse: [ browser startRecording ].
+
 	recordFileRef := self updateLoggerFileName.
 	records := OrderedCollection new.
 
@@ -55,7 +56,7 @@ DSRecordBrowserTest >> setUp [
 DSRecordBrowserTest >> tearDown [
 
 	DSRecordRegistry current reset.
-	browser stopRecording.
+	DSSpy recordingSession ifTrue: [ browser stopRecording ].
 
 	super tearDown
 ]
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index ada4041..92cbee6 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -350,9 +350,8 @@ DSRecordBrowser >> stopRecording [
 	DSSpyInstrumenter stopInstrumentation.
 	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
 	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
-	recorderWindow ifNotNil: [
-			recorderWindow stopTimer.
-			self currentWorld removeMorph: recorderWindow ]
+	recorderWindow stopTimer.
+	self currentWorld removeMorph: recorderWindow
 ]
 
 { #category : 'layout' }