From ccd7b87c8acc8f3b47aa792241d8be5acf0ee08b Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:31:48 +0200
Subject: [PATCH 1/8] Check spreadsheet importing and return an error when not
 supported

---
 Gameye-Examples/GameyeExamples.class.st       |  2 +-
 .../GameyeCollectionFactoryTest.class.st      |  9 +++++
 Gameye/GameyeCollectionFactory.class.st       | 33 +++++++++++--------
 Gameye/GameyeError.class.st                   |  5 +++
 Gameye/GameyeInputDataUtils.class.st          | 12 +++++--
 Gameye/NotAFileGameyeError.class.st           | 10 ++++++
 ...pportedSpreadsheetFileGameyeError.class.st | 10 ++++++
 7 files changed, 64 insertions(+), 17 deletions(-)
 create mode 100644 Gameye/GameyeError.class.st
 create mode 100644 Gameye/NotAFileGameyeError.class.st
 create mode 100644 Gameye/NotSupportedSpreadsheetFileGameyeError.class.st

diff --git a/Gameye-Examples/GameyeExamples.class.st b/Gameye-Examples/GameyeExamples.class.st
index 7440124..6bb9d6f 100644
--- a/Gameye-Examples/GameyeExamples.class.st
+++ b/Gameye-Examples/GameyeExamples.class.st
@@ -6,7 +6,7 @@ Class {
 
 { #category : #'1 - load datas' }
 GameyeExamples class >> loadExportedSpreadsheet [
-	"Open a file browser and load a .csv file exported with the application"
+	"Open a file browser and load a .csv file exported with the application, this example works with Gameye v4.x and v5.x"
 	<script>
 
 	| fileReference |
diff --git a/Gameye-Tests/GameyeCollectionFactoryTest.class.st b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
index d508c4b..e87fb6a 100644
--- a/Gameye-Tests/GameyeCollectionFactoryTest.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
@@ -379,3 +379,12 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Wishl
 	self assert: forSellCollection havePrintMedias equals: false.
 	self assert: forSellCollection numberOfCollectibles equals: 0
 ]
+
+{ #category : #tests }
+GameyeCollectionFactoryTest >> testCreateCollectionFromNotSupportedFiles [
+	| error |
+	
+	error := nil.
+	[ GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: nil ] onErrorDo: [ :e | error := e].
+	self assert: error class equals: NotAFileGameyeError.
+]
diff --git a/Gameye/GameyeCollectionFactory.class.st b/Gameye/GameyeCollectionFactory.class.st
index 095d1e2..7a6fbd1 100644
--- a/Gameye/GameyeCollectionFactory.class.st
+++ b/Gameye/GameyeCollectionFactory.class.st
@@ -48,17 +48,6 @@ GameyeCollectionFactory class >> createCollectibleFromDataArray: anArray [
 	^ collectible
 ]
 
-{ #category : #'create collection' }
-GameyeCollectionFactory class >> createCollectionFromExportedSpreadsheet: aFileReference [
-	"Return just the collectibles collection (not for sell and wish list collections)"
-	
-	| collections |
-	collections := self createCollectionsFromExportedSpreadsheet: aFileReference.
-	collections ifNil:[ ^ nil ].
-	
-	^ collections at: GameyeCollection owned
-]
-
 { #category : #private }
 GameyeCollectionFactory class >> createCollectionsFromDataArray: anArray [
 	"Return collections from array : collectibles, wishlist and for sell"
@@ -92,10 +81,11 @@ GameyeCollectionFactory class >> createCollectionsFromExportedSpreadsheet: aFile
 	"Return all collections from a file : collectibles, for sell and wish list"
 	| readStream array date collections fileName |
 
-	aFileReference ifNil:[ ^ nil ].
-	aFileReference isFile ifFalse:[ ^ nil ].
+	aFileReference ifNil:[ ^ self signalNotAFile ].
+	aFileReference isFile ifFalse:[ ^ self signalNotAFile ].
 
 	readStream := GameyeInputDataUtils prepareExportedSpreadsheetReadStream: aFileReference readStream.
+	
 	array := self parseExportedSpreadsheetReadStream: readStream.
 	
 	collections := (self createCollectionsFromDataArray: array) ifNil:[ ^ nil ].
@@ -124,6 +114,17 @@ GameyeCollectionFactory class >> createForSellCollectionFromExportedSpreadsheet:
 	^ collections at: GameyeCollection forSell
 ]
 
+{ #category : #'create collection' }
+GameyeCollectionFactory class >> createOwnedCollectionFromExportedSpreadsheet: aFileReference [
+	"Return just the collectibles collection (not for sell and wish list collections)"
+	
+	| collections |
+	collections := self createCollectionsFromExportedSpreadsheet: aFileReference.
+	collections ifNil:[ ^ nil ].
+	
+	^ collections at: GameyeCollection owned
+]
+
 { #category : #'create collection' }
 GameyeCollectionFactory class >> createWishListCollectionFromExportedSpreadsheet: aFileReference [
 	"Return just the wish list collection (not collection and for sell collections)"
@@ -194,6 +195,12 @@ GameyeCollectionFactory class >> parseNeoNumberString: aString [
 	^ NeoNumberParser parse: aString ifFail: [nil]
 ]
 
+{ #category : #'error signalling' }
+GameyeCollectionFactory class >> signalNotAFile [
+
+	^ NotAFileGameyeError signal
+]
+
 { #category : #'see class side' }
 GameyeCollectionFactory >> seeClassSide [
 ]
diff --git a/Gameye/GameyeError.class.st b/Gameye/GameyeError.class.st
new file mode 100644
index 0000000..8c5eab6
--- /dev/null
+++ b/Gameye/GameyeError.class.st
@@ -0,0 +1,5 @@
+Class {
+	#name : #GameyeError,
+	#superclass : #Error,
+	#category : #'Gameye-Error'
+}
diff --git a/Gameye/GameyeInputDataUtils.class.st b/Gameye/GameyeInputDataUtils.class.st
index 5f1373d..1bcff1b 100644
--- a/Gameye/GameyeInputDataUtils.class.st
+++ b/Gameye/GameyeInputDataUtils.class.st
@@ -84,13 +84,13 @@ GameyeInputDataUtils class >> prepareExportedSpreadsheetReadStream: aReadstream
 	"Return a ReadStream of an exported SpreadSheet file with fixing all knowns generation knowns problems"
 
 	| line fixedStream columns |
-	aReadstream ifNil:[ ^ nil ].
+	aReadstream ifNil:[ ^ self signalNotSupportedSpreadsheetFile ].
 
 	"Check if the first line (normally it's columns head) have the good number of columns and the good first title"
 	line := aReadstream nextLine.
 	columns := (line substrings: ',').
-	columns size = self numberOfExportedSpreadsheetColumns ifFalse: [ ^ nil ].
-	columns first = self exportedSpreadsheetColumn01Title ifFalse:[ ^ nil ].
+	columns size = self numberOfExportedSpreadsheetColumns ifFalse: [ ^ self signalNotSupportedSpreadsheetFile ].
+	columns first = self exportedSpreadsheetColumn01Title ifFalse:[ ^ self signalNotSupportedSpreadsheetFile ].
 
 	"Build the new stream"
 	fixedStream := ReadWriteStream on: String new.
@@ -166,6 +166,12 @@ GameyeInputDataUtils class >> rebuildCells: aCellsArray [
 	^newCells asArray
 ]
 
+{ #category : #'error signalling' }
+GameyeInputDataUtils class >> signalNotSupportedSpreadsheetFile [
+
+	^ NotSupportedSpreadsheetFileGameyeError signal 
+]
+
 { #category : #'see class side' }
 GameyeInputDataUtils >> seeClassSide [
 ]
diff --git a/Gameye/NotAFileGameyeError.class.st b/Gameye/NotAFileGameyeError.class.st
new file mode 100644
index 0000000..56f80c8
--- /dev/null
+++ b/Gameye/NotAFileGameyeError.class.st
@@ -0,0 +1,10 @@
+Class {
+	#name : #NotAFileGameyeError,
+	#superclass : #GameyeError,
+	#category : #'Gameye-Error'
+}
+
+{ #category : #accessing }
+NotAFileGameyeError >> messageText [
+	^ 'This element is not a file'
+]
diff --git a/Gameye/NotSupportedSpreadsheetFileGameyeError.class.st b/Gameye/NotSupportedSpreadsheetFileGameyeError.class.st
new file mode 100644
index 0000000..b166bcd
--- /dev/null
+++ b/Gameye/NotSupportedSpreadsheetFileGameyeError.class.st
@@ -0,0 +1,10 @@
+Class {
+	#name : #NotSupportedSpreadsheetFileGameyeError,
+	#superclass : #GameyeError,
+	#category : #'Gameye-Error'
+}
+
+{ #category : #accessing }
+NotSupportedSpreadsheetFileGameyeError >> messageText [
+	^ 'Not supported spreadsheet file'
+]

From 85858b4a9076866d29c76d759396565452a23ada Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:34:02 +0200
Subject: [PATCH 2/8] Create GameyeSpreadsheetSampleV4.csv

---
 GameyeSpreadsheetSampleV4.csv | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 GameyeSpreadsheetSampleV4.csv

diff --git a/GameyeSpreadsheetSampleV4.csv b/GameyeSpreadsheetSampleV4.csv
new file mode 100644
index 0000000..0c63560
--- /dev/null
+++ b/GameyeSpreadsheetSampleV4.csv
@@ -0,0 +1,10 @@
+Platform,Type,Owned,ForSale,Wishlist,Title,Publisher,Developer,DateAdded,Ownership,PriceLoose,PriceCIB,PriceNew,YourPrice,PricePaid,ItemCondition,BoxCondition,ManualCondition,Beat,PlayedCompletion,Notes
+"N64","VideoGame",1,0,0,"Doom 64","Midway Games","Midway","25/04/2022","CIB","28.59","86.75","606.32","86.75","23.32","10","10","10"," "," ",""
+"SNES","VideoGame",1,0,0,"Doom","Williams Electronic Games, Inc.","Sculptured Software","04/04/2022","CIB","37.27","109.60","522.37","109.60","67.16","10","10","10"," "," ",""
+"Xbox","VideoGame",1,0,0,"Doom 3","Activision","Vicarious Visions","30/10/2021","CIB","5.60","9.32","47.57","9.32","5.60","10","10","9"," "," ",""
+"Xbox","VideoGame",1,0,0,"Doom 3: Limited Collectors Edition","(null)","(null)","12/07/2022","CIB","6.53","11.11","34.09","11.11","18.66","10","10","10"," "," ",""
+"PS2","Peripherals",1,0,0,"8MB Memory Card","Missing Field","Missing Field","31/01/2022","Loose","6.83","9.30","18.65","6.83","-1.0","?","?","10"," "," ",""
+"PS2","Peripherals",1,0,0,"Black Dual Shock Controller","Missing Field","Missing Field","31/01/2022","Loose","17.27","17.71","68.42","17.27","-1.0","?","?","10"," "," ",""
+"PS2","Peripherals",1,0,0,"DVD Remote Control","Missing Field","Missing Field","15/07/2021","Sealed","9.24","13.18","22.98","22.98","13.99","10","10","10"," "," ",""
+"PS2","Systems",1,0,0,"Playstation 2 System","Missing Field","Missing Field","22/03/2021","CIB","61.10","256.50","378.55","256.50","?","10","10","10"," "," ",""
+"amiibo","ToysToLife",1,0,0,"Zelda - Breath of Wild","Missing Field","Missing Field","19/04/2022","Loose","26.11","26.11","36.44","26.11","13.99","?","?","10"," "," ","A cool amiibo :)"

From 8221b14625e34d2a872cf2a5781fb5067345f728 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:34:36 +0200
Subject: [PATCH 3/8] Delete GameyeSpreadsheetSample.csv

---
 GameyeSpreadsheetSample.csv | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 GameyeSpreadsheetSample.csv

diff --git a/GameyeSpreadsheetSample.csv b/GameyeSpreadsheetSample.csv
deleted file mode 100644
index 408eb2c..0000000
--- a/GameyeSpreadsheetSample.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-Platform,Type,Owned,ForSale,Wishlist,Title,Publisher,Developer,DateAdded,Ownership,PriceLoose,PriceCIB,PriceNew,YourPrice,PricePaid,ItemCondition,BoxCondition,ManualCondition,Beat,PlayedCompletion,Notes
-"N64","VideoGame",1,0,0,"Doom 64","Midway Games","Midway","25/04/2022","CIB","28.59","86.75","606.32","86.75","23.32","10","10","10"," "," ",""
-"SNES","VideoGame",1,0,0,"Doom","Williams Electronic Games, Inc.","Sculptured Software","04/04/2022","CIB","37.27","109.60","522.37","109.60","67.16","10","10","10"," "," ",""
-"Xbox","VideoGame",1,0,0,"Doom 3","Activision","Vicarious Visions","30/10/2021","CIB","5.60","9.32","47.57","9.32","5.60","10","10","9"," "," ",""
-"Xbox","VideoGame",1,0,0,"Doom 3: Limited Collectors Edition","(null)","(null)","12/07/2022","CIB","6.53","11.11","34.09","11.11","18.66","10","10","10"," "," ",""
-"PS2","Peripherals",1,0,0,"8MB Memory Card","Missing Field","Missing Field","31/01/2022","Loose","6.83","9.30","18.65","6.83","-1.0","?","?","10"," "," ",""
-"PS2","Peripherals",1,0,0,"Black Dual Shock Controller","Missing Field","Missing Field","31/01/2022","Loose","17.27","17.71","68.42","17.27","-1.0","?","?","10"," "," ",""
-"PS2","Peripherals",1,0,0,"DVD Remote Control","Missing Field","Missing Field","15/07/2021","Sealed","9.24","13.18","22.98","22.98","13.99","10","10","10"," "," ",""
-"PS2","Systems",1,0,0,"Playstation 2 System","Missing Field","Missing Field","22/03/2021","CIB","61.10","256.50","378.55","256.50","?","10","10","10"," "," ",""
-"amiibo","ToysToLife",1,0,0,"Zelda - Breath of Wild","Missing Field","Missing Field","19/04/2022","Loose","26.11","26.11","36.44","26.11","13.99","?","?","10"," "," ","A cool amiibo :)"
\ No newline at end of file

From 275d37aeee91cab81cde79a4b082db91ef1859cd Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:36:42 +0200
Subject: [PATCH 4/8] tag tests protocols with v4

---
 .../GameyeCollectionFactoryTest.class.st      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gameye-Tests/GameyeCollectionFactoryTest.class.st b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
index e87fb6a..9f29e0d 100644
--- a/Gameye-Tests/GameyeCollectionFactoryTest.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
@@ -7,21 +7,21 @@ Class {
 	#category : #'Gameye-Tests-Core'
 }
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1Peripheral [
 
 	^self exportedSpreadsheetSampleHeadContent, '
 "N64","Peripherals",1,0,0,"Expansion Pak","Missing Field","Missing Field","10/07/2021","CIB","46.63","77.35","112.19","77.35","51.85","10","10","10"," "," ",""'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1PeripheralAsAUnknownCollectible [
 
 	^self exportedSpreadsheetSampleHeadContent, '
 "SNES","?",1,0,0,"Super Scope 6 [Gun Bundle]","Missing Field","Missing Field","13/09/2021","Boxed","-1.0", "-1.0", "-1.0", "-1.0","55.97","10","?","9"," "," ","This is a commentary"'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1PrintMedia [
 	"1 Print media sample"
 
@@ -29,7 +29,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1PrintMedi
 "N Power","Print Media",1,0,0,"[Vol. 145] Mario Advance","Missing Field","Missing Field","11/03/2023","Loose","9.49","14.23","?","9.49","1.90","?","?","10"," "," ",""'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1System [
 	"1 System sample"
 
@@ -37,7 +37,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1System [
 "Saturn","Systems",1,0,0,"Sega Saturn Console (PAL)","Missing Field","Missing Field","18/07/2022","Boxed","88.91","169.46","381.99","156.75","139.92","10","?","10"," "," ",""'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1ToyToLife [
 	"1 System sample"
 
@@ -45,7 +45,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1ToyToLife
 "amiibo","ToysToLife",1,0,0,"Zelda - Breath of Wild","Missing Field","Missing Field","19/04/2022","Loose","26.11","26.11","36.44","26.11","13.99","?","?","10"," "," ",""'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1VideoGameWitComplexeStringValues [
 	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
 
@@ -53,7 +53,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1VideoGame
 "NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""'
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_3VideoGames2SystemsWitComplexeStringValues [
 	"This is an extract from problematic strings content"
 
@@ -65,7 +65,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_3VideoGame
 "PS1","VideoGame",1,0,0,"Broken Sword 2 - Les Boucliers de Quetzalcoatl","Sony","Revolution Software Ltd.","22/03/2021","CIB","-1.0", "-1.0", "-1.0", "-1.0","-1.0","10","10","10"," "," ",""'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_4VideoGamesWitComplexeStringValues [
 	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
 
@@ -76,14 +76,14 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_4VideoGame
 "Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"'
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_Empty [
 	"This sample contains some frequently generated cases not easy to read/parse or exceptions due to collection evolution"
 
 	^self exportedSpreadsheetSampleHeadContent
 ]
 
-{ #category : #samples }
+{ #category : #'samples - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_Wishlist_1VideoGame [
 	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
 
@@ -108,7 +108,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReference: aFi
 	^file
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReference_Empty [
 	<script:'self exportedSpreadsheetSampleFileReference_Empty inspect'>
 
@@ -121,7 +121,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFilename [
 	^'2_20_2023_ge_collection'
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - v4' }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleHeadContent [
 	"This sample contains columns head"
 

From a5c0b84e6666de7b262e0fff53de94ca8d324b12 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:39:58 +0200
Subject: [PATCH 5/8] Rename test samples as V4

---
 .../GameyeCollectionFactoryTest.class.st      | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/Gameye-Tests/GameyeCollectionFactoryTest.class.st b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
index 9f29e0d..2812774 100644
--- a/Gameye-Tests/GameyeCollectionFactoryTest.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
@@ -8,56 +8,56 @@ Class {
 }
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1Peripheral [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1Peripheral [
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "N64","Peripherals",1,0,0,"Expansion Pak","Missing Field","Missing Field","10/07/2021","CIB","46.63","77.35","112.19","77.35","51.85","10","10","10"," "," ",""'
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1PeripheralAsAUnknownCollectible [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1PeripheralAsAUnknownCollectible [
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "SNES","?",1,0,0,"Super Scope 6 [Gun Bundle]","Missing Field","Missing Field","13/09/2021","Boxed","-1.0", "-1.0", "-1.0", "-1.0","55.97","10","?","9"," "," ","This is a commentary"'
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1PrintMedia [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1PrintMedia [
 	"1 Print media sample"
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "N Power","Print Media",1,0,0,"[Vol. 145] Mario Advance","Missing Field","Missing Field","11/03/2023","Loose","9.49","14.23","?","9.49","1.90","?","?","10"," "," ",""'
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1System [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1System [
 	"1 System sample"
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "Saturn","Systems",1,0,0,"Sega Saturn Console (PAL)","Missing Field","Missing Field","18/07/2022","Boxed","88.91","169.46","381.99","156.75","139.92","10","?","10"," "," ",""'
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1ToyToLife [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1ToyToLife [
 	"1 System sample"
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "amiibo","ToysToLife",1,0,0,"Zelda - Breath of Wild","Missing Field","Missing Field","19/04/2022","Loose","26.11","26.11","36.44","26.11","13.99","?","?","10"," "," ",""'
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_1VideoGameWitComplexeStringValues [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1VideoGameWitComplexeStringValues [
 	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""'
 ]
 
 { #category : #'accessing - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_3VideoGames2SystemsWitComplexeStringValues [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_3VideoGames2SystemsWitComplexeStringValues [
 	"This is an extract from problematic strings content"
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "Atari 2600","VideoGame",1,0,0,"Q*bert","Atari, Inc.","Parker Brothers","22/03/2021","Loose","6.97","16.37","42.73","6.97","?","?","?","8"," "," ",""
 "Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"
 "Atari 2600","Systems",1,0,0,"Atari 2600 System [Vadar]","Missing Field","Missing Field","04/04/2021","CIB","54.38","146.51","219.34","146.51","71.21","10","9","10"," "," ","Pack avec Space invaders, modèle cx-2600-gp"
@@ -66,10 +66,10 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_3VideoGame
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_4VideoGamesWitComplexeStringValues [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_4VideoGamesWitComplexeStringValues [
 	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ","
 "Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"
 "NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""
@@ -77,17 +77,17 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_4VideoGame
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_Empty [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_Empty [
 	"This sample contains some frequently generated cases not easy to read/parse or exceptions due to collection evolution"
 
-	^self exportedSpreadsheetSampleHeadContent
+	^self exportedSpreadsheetSampleHeadContentV4
 ]
 
 { #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContent_Wishlist_1VideoGame [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_Wishlist_1VideoGame [
 	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
 
-	^self exportedSpreadsheetSampleHeadContent, '
+	^self exportedSpreadsheetSampleHeadContentV4, '
 "Switch","VideoGame",0,0,1,"Advance Wars 1+2: Re-Boot Camp","Nintendo","WayForward Technologies","","Wishlist","-1.0", "-1.0", "-1.0", "-1.0","-1.0"," "," "," "," "," ",""'
 ]
 
@@ -109,10 +109,10 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReference: aFi
 ]
 
 { #category : #'accessing - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReference_Empty [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReferenceV4_Empty [
 	<script:'self exportedSpreadsheetSampleFileReference_Empty inspect'>
 
-	^self exportedSpreadsheetSampleFileReference: self exportedSpreadsheetSampleContent_Empty
+	^self exportedSpreadsheetSampleFileReference: self exportedSpreadsheetSampleContentV4_Empty
 ]
 
 { #category : #accessing }
@@ -122,7 +122,7 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFilename [
 ]
 
 { #category : #'accessing - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleHeadContent [
+GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleHeadContentV4 [
 	"This sample contains columns head"
 
 	^'Platform,Type,Owned,ForSale,Wishlist,Title,Publisher,Developer,DateAdded,Ownership,PriceLoose,PriceCIB,PriceNew,YourPrice,PricePaid,ItemCondition,BoxCondition,ManualCondition,Beat,PlayedCompletion,Notes'
@@ -158,7 +158,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Peri
 
 	| collection collectible collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet:  (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_1Peripheral).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1Peripheral).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -182,7 +182,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Peri
 
 	| collection collectible collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_1PeripheralAsAUnknownCollectible).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1PeripheralAsAUnknownCollectible).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -207,7 +207,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Prin
 
 	| collection collectible collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_1PrintMedia).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1PrintMedia).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -231,7 +231,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Syst
 
 	| collection collectible collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_1System).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1System).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -255,7 +255,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1ToyT
 
 	| collection collectible collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_1ToyToLife).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1ToyToLife).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -279,7 +279,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Vide
 
 	| collection collectible collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_1VideoGameWitComplexeStringValues).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1VideoGameWitComplexeStringValues).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -303,7 +303,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_3Vide
 
 	| collection collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_3VideoGames2SystemsWitComplexeStringValues).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_3VideoGames2SystemsWitComplexeStringValues).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -325,7 +325,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Empty
 
 	| collection collections |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_Empty).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_Empty).
 
 	collection := collections at: GameyeCollection owned.
 	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
@@ -345,7 +345,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Wishl
 
 	| collections wishListCollection collection forSellCollection |
 	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContent_Wishlist_1VideoGame).
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_Wishlist_1VideoGame).
 
 	self assert: collections size equals: 3.
 

From 947d410f66b8c266bb5476b946f960c2920be829 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:41:06 +0200
Subject: [PATCH 6/8] update test protocols

---
 .../GameyeCollectionFactoryTest.class.st       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gameye-Tests/GameyeCollectionFactoryTest.class.st b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
index 2812774..2a4e000 100644
--- a/Gameye-Tests/GameyeCollectionFactoryTest.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
@@ -153,7 +153,7 @@ GameyeCollectionFactoryTest >> assertWishAndForSellCollectionsAreEmpty: collecti
 	self assert: forSellCollection numberOfCollectibles equals: 0
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Peripheral [
 
 	| collection collectible collections |
@@ -177,7 +177,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Peri
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1PeripheralAsAUnknownCollectible [
 
 	| collection collectible collections |
@@ -202,7 +202,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Peri
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1PrintMedia [
 
 	| collection collectible collections |
@@ -226,7 +226,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Prin
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1System [
 
 	| collection collectible collections |
@@ -250,7 +250,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Syst
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1ToyToLife [
 
 	| collection collectible collections |
@@ -274,7 +274,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1ToyT
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1VideoGameWitComplexeStringValues [
 
 	| collection collectible collections |
@@ -298,7 +298,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Vide
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_3VideoGames2SystemsWitComplexeStringValues [
 
 	| collection collections |
@@ -320,7 +320,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_3Vide
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Empty [
 
 	| collection collections |
@@ -340,7 +340,7 @@ GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Empty
 	self assertWishAndForSellCollectionsAreEmpty: collections
 ]
 
-{ #category : #tests }
+{ #category : #'tests - v4' }
 GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Wishlist_1VideoGame [
 
 	| collections wishListCollection collection forSellCollection |

From b087ab59602faaa99db4c0bc01b4f3ebfb46cb86 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 18:51:51 +0200
Subject: [PATCH 7/8] Move V4 tests into a dedicated class

---
 .../GameyeCollectionFactoryTest.class.st      | 330 +-----------------
 .../GameyeCollectionFactoryV4Test.class.st    | 330 ++++++++++++++++++
 2 files changed, 341 insertions(+), 319 deletions(-)
 create mode 100644 Gameye-Tests/GameyeCollectionFactoryV4Test.class.st

diff --git a/Gameye-Tests/GameyeCollectionFactoryTest.class.st b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
index 2a4e000..9686d45 100644
--- a/Gameye-Tests/GameyeCollectionFactoryTest.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
@@ -4,93 +4,12 @@ A GameyeInputDataReaderTest is a test class for testing the behavior of GameyeIn
 Class {
 	#name : #GameyeCollectionFactoryTest,
 	#superclass : #TestCase,
+	#instVars : [
+		'datas'
+	],
 	#category : #'Gameye-Tests-Core'
 }
 
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1Peripheral [
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"N64","Peripherals",1,0,0,"Expansion Pak","Missing Field","Missing Field","10/07/2021","CIB","46.63","77.35","112.19","77.35","51.85","10","10","10"," "," ",""'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1PeripheralAsAUnknownCollectible [
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"SNES","?",1,0,0,"Super Scope 6 [Gun Bundle]","Missing Field","Missing Field","13/09/2021","Boxed","-1.0", "-1.0", "-1.0", "-1.0","55.97","10","?","9"," "," ","This is a commentary"'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1PrintMedia [
-	"1 Print media sample"
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"N Power","Print Media",1,0,0,"[Vol. 145] Mario Advance","Missing Field","Missing Field","11/03/2023","Loose","9.49","14.23","?","9.49","1.90","?","?","10"," "," ",""'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1System [
-	"1 System sample"
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"Saturn","Systems",1,0,0,"Sega Saturn Console (PAL)","Missing Field","Missing Field","18/07/2022","Boxed","88.91","169.46","381.99","156.75","139.92","10","?","10"," "," ",""'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1ToyToLife [
-	"1 System sample"
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"amiibo","ToysToLife",1,0,0,"Zelda - Breath of Wild","Missing Field","Missing Field","19/04/2022","Loose","26.11","26.11","36.44","26.11","13.99","?","?","10"," "," ",""'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_1VideoGameWitComplexeStringValues [
-	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""'
-]
-
-{ #category : #'accessing - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_3VideoGames2SystemsWitComplexeStringValues [
-	"This is an extract from problematic strings content"
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"Atari 2600","VideoGame",1,0,0,"Q*bert","Atari, Inc.","Parker Brothers","22/03/2021","Loose","6.97","16.37","42.73","6.97","?","?","?","8"," "," ",""
-"Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"
-"Atari 2600","Systems",1,0,0,"Atari 2600 System [Vadar]","Missing Field","Missing Field","04/04/2021","CIB","54.38","146.51","219.34","146.51","71.21","10","9","10"," "," ","Pack avec Space invaders, modèle cx-2600-gp"
-"Atari 2600","Systems",1,0,0,"Atari 2600 System [Vadar]","Missing Field","Missing Field","15/04/2021","CIB","54.38","146.51","219.34","146.51","?","10","10","10"," "," ","Avec le jeu othello, modèle cx-2600-gp"
-"PS1","VideoGame",1,0,0,"Broken Sword 2 - Les Boucliers de Quetzalcoatl","Sony","Revolution Software Ltd.","22/03/2021","CIB","-1.0", "-1.0", "-1.0", "-1.0","-1.0","10","10","10"," "," ",""'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_4VideoGamesWitComplexeStringValues [
-	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ","
-"Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"
-"NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""
-"Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"'
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_Empty [
-	"This sample contains some frequently generated cases not easy to read/parse or exceptions due to collection evolution"
-
-	^self exportedSpreadsheetSampleHeadContentV4
-]
-
-{ #category : #'samples - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleContentV4_Wishlist_1VideoGame [
-	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
-
-	^self exportedSpreadsheetSampleHeadContentV4, '
-"Switch","VideoGame",0,0,1,"Advance Wars 1+2: Re-Boot Camp","Nintendo","WayForward Technologies","","Wishlist","-1.0", "-1.0", "-1.0", "-1.0","-1.0"," "," "," "," "," ",""'
-]
-
 { #category : #utils }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReference: aString [
 	
@@ -108,26 +27,12 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReference: aFi
 	^file
 ]
 
-{ #category : #'accessing - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFileReferenceV4_Empty [
-	<script:'self exportedSpreadsheetSampleFileReference_Empty inspect'>
-
-	^self exportedSpreadsheetSampleFileReference: self exportedSpreadsheetSampleContentV4_Empty
-]
-
 { #category : #accessing }
 GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFilename [
 
 	^'2_20_2023_ge_collection'
 ]
 
-{ #category : #'accessing - v4' }
-GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleHeadContentV4 [
-	"This sample contains columns head"
-
-	^'Platform,Type,Owned,ForSale,Wishlist,Title,Publisher,Developer,DateAdded,Ownership,PriceLoose,PriceCIB,PriceNew,YourPrice,PricePaid,ItemCondition,BoxCondition,ManualCondition,Beat,PlayedCompletion,Notes'
-]
-
 { #category : #assertions }
 GameyeCollectionFactoryTest >> assertWishAndForSellCollectionsAreEmpty: collections [
 	| wishListCollection forSellCollection |
@@ -153,231 +58,18 @@ GameyeCollectionFactoryTest >> assertWishAndForSellCollectionsAreEmpty: collecti
 	self assert: forSellCollection numberOfCollectibles equals: 0
 ]
 
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1Peripheral [
-
-	| collection collectible collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet:  (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1Peripheral).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: true.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 1.
+{ #category : #running }
+GameyeCollectionFactoryTest >> setUp [
 
-	collectible := collection peripheralsCollectibles first.
-	self assert: collectible isPeripheral.
-	self assert: collectible dateAdded equals: (Date newDay: 10 month: 7 year: 2021).
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
-
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1PeripheralAsAUnknownCollectible [
-
-	| collection collectible collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1PeripheralAsAUnknownCollectible).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: true.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 1.
-
-	collectible := collection unknownsCollectibles first.
-	self assert: collectible isUnknown.
-	self assert: collectible dateAdded equals: (Date newDay: 13 month: 9 year: 2021).
-	self assert: collectible rawDatas size equals: GameyeInputDataUtils numberOfExportedSpreadsheetColumns.
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
+	super setUp.
+	datas := nil
 ]
 
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1PrintMedia [
-
-	| collection collectible collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1PrintMedia).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: true.
-	self assert: collection numberOfCollectibles equals: 1.
-
-	collectible := collection printMediasCollectibles first.
-	self assert: collectible dateAdded equals: (Date newDay: 11 month: 3 year: 2023).
-	self assert: collectible isPrintMedia.
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
+{ #category : #running }
+GameyeCollectionFactoryTest >> tearDown [
 
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1System [
-
-	| collection collectible collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1System).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: true.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 1.
-
-	collectible := collection systemsCollectibles first.
-	self assert: collectible dateAdded equals: (Date newDay: 18 month: 7 year: 2022).
-	self assert: collectible isSystem.
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
-
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1ToyToLife [
-
-	| collection collectible collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1ToyToLife).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: true.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 1.
-
-	collectible := collection toysToLifeCollectibles first.
-	self assert: collectible dateAdded equals: (Date newDay: 19 month: 4 year: 2022).
-	self assert: collectible isToyToLife.
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
-
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_1VideoGameWitComplexeStringValues [
-
-	| collection collectible collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1VideoGameWitComplexeStringValues).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: true.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 1.
-
-	collectible := collection videoGamesCollectibles first.
-	self assert: collectible dateAdded equals: (Date newDay: 22 month: 3 year: 2021).
-	self assert: collectible isVideoGame.
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
-
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_3VideoGames2SystemsWitComplexeStringValues [
-
-	| collection collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_3VideoGames2SystemsWitComplexeStringValues).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: true.
-	self assert: collection haveSystems equals: true.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 5.
-	1 to: 3 do:[ :i | self assert: (collection videoGamesCollectibles at: i) isVideoGame ].
-	1 to: 2 do:[ :i | self assert: (collection systemsCollectibles at: i) isSystem ].
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
-
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Empty [
-
-	| collection collections |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_Empty).
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 0.
-
-	self assertWishAndForSellCollectionsAreEmpty: collections
-]
-
-{ #category : #'tests - v4' }
-GameyeCollectionFactoryTest >> testCreateCollectionFromExportedSpreadsheet_Wishlist_1VideoGame [
-
-	| collections wishListCollection collection forSellCollection |
-	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
-		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_Wishlist_1VideoGame).
-
-	self assert: collections size equals: 3.
-
-	wishListCollection := collections at: GameyeCollection wish.
-	self assert: wishListCollection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: wishListCollection haveUnknowns equals: false.
-	self assert: wishListCollection haveVideoGames equals: true.
-	self assert: wishListCollection haveSystems equals: false.
-	self assert: wishListCollection havePeripherals equals: false.
-	self assert: wishListCollection haveToyToLife equals: false.
-	self assert: wishListCollection havePrintMedias equals: false.
-	self assert: wishListCollection numberOfCollectibles equals: 1.
-
-	collection := collections at: GameyeCollection owned.
-	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: collection haveUnknowns equals: false.
-	self assert: collection haveVideoGames equals: false.
-	self assert: collection haveSystems equals: false.
-	self assert: collection havePeripherals equals: false.
-	self assert: collection haveToyToLife equals: false.
-	self assert: collection havePrintMedias equals: false.
-	self assert: collection numberOfCollectibles equals: 0.
-
-	forSellCollection := collections at: GameyeCollection forSell.
-	self assert: forSellCollection date equals: (Date newDay: 20 month: 2 year: 2023).
-	self assert: forSellCollection haveUnknowns equals: false.
-	self assert: forSellCollection haveVideoGames equals: false.
-	self assert: forSellCollection haveSystems equals: false.
-	self assert: forSellCollection havePeripherals equals: false.
-	self assert: forSellCollection haveToyToLife equals: false.
-	self assert: forSellCollection havePrintMedias equals: false.
-	self assert: forSellCollection numberOfCollectibles equals: 0
+	datas := nil.
+	super tearDown
 ]
 
 { #category : #tests }
diff --git a/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st b/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st
new file mode 100644
index 0000000..56cfb8e
--- /dev/null
+++ b/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st
@@ -0,0 +1,330 @@
+Class {
+	#name : #GameyeCollectionFactoryV4Test,
+	#superclass : #GameyeCollectionFactoryTest,
+	#category : #'Gameye-Tests-Core'
+}
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_1Peripheral [
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"N64","Peripherals",1,0,0,"Expansion Pak","Missing Field","Missing Field","10/07/2021","CIB","46.63","77.35","112.19","77.35","51.85","10","10","10"," "," ",""'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_1PeripheralAsAUnknownCollectible [
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"SNES","?",1,0,0,"Super Scope 6 [Gun Bundle]","Missing Field","Missing Field","13/09/2021","Boxed","-1.0", "-1.0", "-1.0", "-1.0","55.97","10","?","9"," "," ","This is a commentary"'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_1PrintMedia [
+	"1 Print media sample"
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"N Power","Print Media",1,0,0,"[Vol. 145] Mario Advance","Missing Field","Missing Field","11/03/2023","Loose","9.49","14.23","?","9.49","1.90","?","?","10"," "," ",""'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_1System [
+	"1 System sample"
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"Saturn","Systems",1,0,0,"Sega Saturn Console (PAL)","Missing Field","Missing Field","18/07/2022","Boxed","88.91","169.46","381.99","156.75","139.92","10","?","10"," "," ",""'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_1ToyToLife [
+	"1 System sample"
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"amiibo","ToysToLife",1,0,0,"Zelda - Breath of Wild","Missing Field","Missing Field","19/04/2022","Loose","26.11","26.11","36.44","26.11","13.99","?","?","10"," "," ",""'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_1VideoGameWitComplexeStringValues [
+	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""'
+]
+
+{ #category : #'accessing - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_3VideoGames2SystemsWitComplexeStringValues [
+	"This is an extract from problematic strings content"
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"Atari 2600","VideoGame",1,0,0,"Q*bert","Atari, Inc.","Parker Brothers","22/03/2021","Loose","6.97","16.37","42.73","6.97","?","?","?","8"," "," ",""
+"Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"
+"Atari 2600","Systems",1,0,0,"Atari 2600 System [Vadar]","Missing Field","Missing Field","04/04/2021","CIB","54.38","146.51","219.34","146.51","71.21","10","9","10"," "," ","Pack avec Space invaders, modèle cx-2600-gp"
+"Atari 2600","Systems",1,0,0,"Atari 2600 System [Vadar]","Missing Field","Missing Field","15/04/2021","CIB","54.38","146.51","219.34","146.51","?","10","10","10"," "," ","Avec le jeu othello, modèle cx-2600-gp"
+"PS1","VideoGame",1,0,0,"Broken Sword 2 - Les Boucliers de Quetzalcoatl","Sony","Revolution Software Ltd.","22/03/2021","CIB","-1.0", "-1.0", "-1.0", "-1.0","-1.0","10","10","10"," "," ",""'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_4VideoGamesWitComplexeStringValues [
+	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ","
+"Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"
+"NES","VideoGame",1,0,0,"Ivan "Ironman" Stewart''s Super Off Road","Tradewest, Inc.","Rare, Ltd.","22/03/2021","CIB","10.85","46.64","326.48","46.64","-1.0","6","7","7"," "," ",""
+"Atari 2600","VideoGame",1,0,0,"Space Invaders","(null)","(null)","22/03/2021","Loose","-1.0", "-1.0", "-1.0", "-1.0","?","?","?","5"," "," ","Étiquette percée, en pack avec la console"'
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_Empty [
+	"This sample contains some frequently generated cases not easy to read/parse or exceptions due to collection evolution"
+
+	^self exportedSpreadsheetSampleHeadContentV4
+]
+
+{ #category : #'samples - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_Wishlist_1VideoGame [
+	"This game have title and developper names with coma and quotes : ""Ivan ""Ironman"" Stewart's Super Off Road"" and ""Rare, Ltd."""
+
+	^self exportedSpreadsheetSampleHeadContentV4, '
+"Switch","VideoGame",0,0,1,"Advance Wars 1+2: Re-Boot Camp","Nintendo","WayForward Technologies","","Wishlist","-1.0", "-1.0", "-1.0", "-1.0","-1.0"," "," "," "," "," ",""'
+]
+
+{ #category : #'accessing - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleFileReferenceV4_Empty [
+	<script:'self exportedSpreadsheetSampleFileReference_Empty inspect'>
+
+	^self exportedSpreadsheetSampleFileReference: self exportedSpreadsheetSampleContentV4_Empty
+]
+
+{ #category : #'accessing - v4' }
+GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleHeadContentV4 [
+	"This sample contains columns head"
+
+	^'Platform,Type,Owned,ForSale,Wishlist,Title,Publisher,Developer,DateAdded,Ownership,PriceLoose,PriceCIB,PriceNew,YourPrice,PricePaid,ItemCondition,BoxCondition,ManualCondition,Beat,PlayedCompletion,Notes'
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1Peripheral [
+
+	| collection collectible |
+	datas := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet:  (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1Peripheral).
+
+	collection := datas at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: true.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 1.
+
+	collectible := collection peripheralsCollectibles first.
+	self assert: collectible isPeripheral.
+	self assert: collectible dateAdded equals: (Date newDay: 10 month: 7 year: 2021).
+
+	self assertWishAndForSellCollectionsAreEmpty: datas
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1PeripheralAsAUnknownCollectible [
+
+	| collection collectible collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1PeripheralAsAUnknownCollectible).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: true.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 1.
+
+	collectible := collection unknownsCollectibles first.
+	self assert: collectible isUnknown.
+	self assert: collectible dateAdded equals: (Date newDay: 13 month: 9 year: 2021).
+	self assert: collectible rawDatas size equals: GameyeInputDataUtils numberOfExportedSpreadsheetColumns.
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1PrintMedia [
+
+	| collection collectible collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1PrintMedia).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: true.
+	self assert: collection numberOfCollectibles equals: 1.
+
+	collectible := collection printMediasCollectibles first.
+	self assert: collectible dateAdded equals: (Date newDay: 11 month: 3 year: 2023).
+	self assert: collectible isPrintMedia.
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1System [
+
+	| collection collectible collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1System).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: true.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 1.
+
+	collectible := collection systemsCollectibles first.
+	self assert: collectible dateAdded equals: (Date newDay: 18 month: 7 year: 2022).
+	self assert: collectible isSystem.
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1ToyToLife [
+
+	| collection collectible collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1ToyToLife).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: true.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 1.
+
+	collectible := collection toysToLifeCollectibles first.
+	self assert: collectible dateAdded equals: (Date newDay: 19 month: 4 year: 2022).
+	self assert: collectible isToyToLife.
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1VideoGameWitComplexeStringValues [
+
+	| collection collectible collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_1VideoGameWitComplexeStringValues).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: true.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 1.
+
+	collectible := collection videoGamesCollectibles first.
+	self assert: collectible dateAdded equals: (Date newDay: 22 month: 3 year: 2021).
+	self assert: collectible isVideoGame.
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_3VideoGames2SystemsWitComplexeStringValues [
+
+	| collection collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_3VideoGames2SystemsWitComplexeStringValues).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: true.
+	self assert: collection haveSystems equals: true.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 5.
+	1 to: 3 do:[ :i | self assert: (collection videoGamesCollectibles at: i) isVideoGame ].
+	1 to: 2 do:[ :i | self assert: (collection systemsCollectibles at: i) isSystem ].
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_Empty [
+
+	| collection collections |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_Empty).
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 0.
+
+	self assertWishAndForSellCollectionsAreEmpty: collections
+]
+
+{ #category : #'tests - v4' }
+GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_Wishlist_1VideoGame [
+
+	| collections wishListCollection collection forSellCollection |
+	collections := GameyeCollectionFactory createCollectionsFromExportedSpreadsheet: (self class
+		exportedSpreadsheetSampleFileReference: self class exportedSpreadsheetSampleContentV4_Wishlist_1VideoGame).
+
+	self assert: collections size equals: 3.
+
+	wishListCollection := collections at: GameyeCollection wish.
+	self assert: wishListCollection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: wishListCollection haveUnknowns equals: false.
+	self assert: wishListCollection haveVideoGames equals: true.
+	self assert: wishListCollection haveSystems equals: false.
+	self assert: wishListCollection havePeripherals equals: false.
+	self assert: wishListCollection haveToyToLife equals: false.
+	self assert: wishListCollection havePrintMedias equals: false.
+	self assert: wishListCollection numberOfCollectibles equals: 1.
+
+	collection := collections at: GameyeCollection owned.
+	self assert: collection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: collection haveUnknowns equals: false.
+	self assert: collection haveVideoGames equals: false.
+	self assert: collection haveSystems equals: false.
+	self assert: collection havePeripherals equals: false.
+	self assert: collection haveToyToLife equals: false.
+	self assert: collection havePrintMedias equals: false.
+	self assert: collection numberOfCollectibles equals: 0.
+
+	forSellCollection := collections at: GameyeCollection forSell.
+	self assert: forSellCollection date equals: (Date newDay: 20 month: 2 year: 2023).
+	self assert: forSellCollection haveUnknowns equals: false.
+	self assert: forSellCollection haveVideoGames equals: false.
+	self assert: forSellCollection haveSystems equals: false.
+	self assert: forSellCollection havePeripherals equals: false.
+	self assert: forSellCollection haveToyToLife equals: false.
+	self assert: forSellCollection havePrintMedias equals: false.
+	self assert: forSellCollection numberOfCollectibles equals: 0
+]

From cc997a4c26d6282900ea2b1f9e361226073b5125 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 3 Sep 2023 19:08:58 +0200
Subject: [PATCH 8/8] Add gameyeversion property into Collection

---
 .../GameyeCollectionFactoryTest.class.st      | 12 +++++++++
 .../GameyeCollectionFactoryV4Test.class.st    |  9 ++++++-
 Gameye-Tests/GameyeCollectionTest.class.st    | 10 +++++++
 Gameye/GameyeCollection.class.st              | 13 +++++++++
 Gameye/GameyeCollectionFactory.class.st       |  6 ++---
 Gameye/GameyeVersion.class.st                 | 27 +++++++++++++++++++
 6 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 Gameye/GameyeVersion.class.st

diff --git a/Gameye-Tests/GameyeCollectionFactoryTest.class.st b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
index 9686d45..0efa851 100644
--- a/Gameye-Tests/GameyeCollectionFactoryTest.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryTest.class.st
@@ -33,6 +33,18 @@ GameyeCollectionFactoryTest class >> exportedSpreadsheetSampleFilename [
 	^'2_20_2023_ge_collection'
 ]
 
+{ #category : #assertions }
+GameyeCollectionFactoryTest >> assertCollection: aCollection equalsGameyeVersion: aGameyeVersion [
+
+	self assert: aCollection gameyeVersion equals: aGameyeVersion
+]
+
+{ #category : #assertions }
+GameyeCollectionFactoryTest >> assertCollectionGameyeVersion: aCollection [
+
+	self subclassResponsibility 
+]
+
 { #category : #assertions }
 GameyeCollectionFactoryTest >> assertWishAndForSellCollectionsAreEmpty: collections [
 	| wishListCollection forSellCollection |
diff --git a/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st b/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st
index 56cfb8e..39c1655 100644
--- a/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st
+++ b/Gameye-Tests/GameyeCollectionFactoryV4Test.class.st
@@ -90,7 +90,7 @@ GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleContentV4_Wishli
 
 { #category : #'accessing - v4' }
 GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleFileReferenceV4_Empty [
-	<script:'self exportedSpreadsheetSampleFileReference_Empty inspect'>
+	<script:'self exportedSpreadsheetSampleFileReferenceV4_Empty inspect'>
 
 	^self exportedSpreadsheetSampleFileReference: self exportedSpreadsheetSampleContentV4_Empty
 ]
@@ -102,6 +102,12 @@ GameyeCollectionFactoryV4Test class >> exportedSpreadsheetSampleHeadContentV4 [
 	^'Platform,Type,Owned,ForSale,Wishlist,Title,Publisher,Developer,DateAdded,Ownership,PriceLoose,PriceCIB,PriceNew,YourPrice,PricePaid,ItemCondition,BoxCondition,ManualCondition,Beat,PlayedCompletion,Notes'
 ]
 
+{ #category : #assertions }
+GameyeCollectionFactoryV4Test >> assertCollectionGameyeVersion: aCollection [
+
+	self assertCollection: aCollection equalsGameyeVersion: GameyeVersion v4 
+]
+
 { #category : #'tests - v4' }
 GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1Peripheral [
 
@@ -123,6 +129,7 @@ GameyeCollectionFactoryV4Test >> testCreateCollectionFromExportedSpreadsheet_1Pe
 	self assert: collectible isPeripheral.
 	self assert: collectible dateAdded equals: (Date newDay: 10 month: 7 year: 2021).
 
+	self assertCollectionGameyeVersion: collection.
 	self assertWishAndForSellCollectionsAreEmpty: datas
 ]
 
diff --git a/Gameye-Tests/GameyeCollectionTest.class.st b/Gameye-Tests/GameyeCollectionTest.class.st
index 4274a43..fc712a4 100644
--- a/Gameye-Tests/GameyeCollectionTest.class.st
+++ b/Gameye-Tests/GameyeCollectionTest.class.st
@@ -101,6 +101,15 @@ GameyeCollectionTest >> testDuplicatedVideoGames [
 	self assert: collection duplicatedVideoGames size equals: 6.
 ]
 
+{ #category : #tests }
+GameyeCollectionTest >> testGameyeVersion [
+
+	| collection |
+	collection := GameyeCollection new.
+	collection gameyeVersion: GameyeVersion v4.
+	self assert: collection gameyeVersion equals: GameyeVersion v4
+]
+
 { #category : #tests }
 GameyeCollectionTest >> testIncludesCollectible [
 
@@ -124,6 +133,7 @@ GameyeCollectionTest >> testInitialize [
 	collection := GameyeCollection new.
 	self assert: collection name isNil.
 	self assert: collection date isNil.
+	self assert: collection gameyeVersion equals: GameyeVersion unknown.
 	self assert: collection haveUnknowns equals: false.
 	self assert: collection haveVideoGames equals: false.
 	self assert: collection haveSystems equals: false.
diff --git a/Gameye/GameyeCollection.class.st b/Gameye/GameyeCollection.class.st
index ad58978..42852fc 100644
--- a/Gameye/GameyeCollection.class.st
+++ b/Gameye/GameyeCollection.class.st
@@ -7,6 +7,7 @@ Class {
 	#instVars : [
 		'name',
 		'date',
+		'gameyeVersion',
 		'peripherals',
 		'systems',
 		'toysToLife',
@@ -137,6 +138,18 @@ GameyeCollection >> duplicatedVideoGames [
 	^ self duplicated: self videoGamesCollectibles
 ]
 
+{ #category : #accessing }
+GameyeCollection >> gameyeVersion [
+
+	^ gameyeVersion ifNil: [ gameyeVersion := GameyeVersion unknown ]
+]
+
+{ #category : #accessing }
+GameyeCollection >> gameyeVersion: anObject [
+
+	gameyeVersion := anObject
+]
+
 { #category : #testing }
 GameyeCollection >> havePeripherals [
 
diff --git a/Gameye/GameyeCollectionFactory.class.st b/Gameye/GameyeCollectionFactory.class.st
index 7a6fbd1..bcfd1ee 100644
--- a/Gameye/GameyeCollectionFactory.class.st
+++ b/Gameye/GameyeCollectionFactory.class.st
@@ -54,9 +54,9 @@ GameyeCollectionFactory class >> createCollectionsFromDataArray: anArray [
 	| collection collections wishListCollection forSellCollection |
 
 	collections := Dictionary new.
-	collection := GameyeCollection new.
-	wishListCollection := GameyeCollection new.
-	forSellCollection := GameyeCollection new.
+	collection := GameyeCollection new gameyeVersion: GameyeVersion v4; yourself.
+	wishListCollection := GameyeCollection new gameyeVersion: GameyeVersion v4; yourself.
+	forSellCollection := GameyeCollection new gameyeVersion: GameyeVersion v4; yourself.
 
 	collections at: GameyeCollection owned put: collection.
 	collections at: GameyeCollection wish put: wishListCollection.
diff --git a/Gameye/GameyeVersion.class.st b/Gameye/GameyeVersion.class.st
new file mode 100644
index 0000000..b8540a5
--- /dev/null
+++ b/Gameye/GameyeVersion.class.st
@@ -0,0 +1,27 @@
+Class {
+	#name : #GameyeVersion,
+	#superclass : #Object,
+	#category : #'Gameye-Model'
+}
+
+{ #category : #versions }
+GameyeVersion class >> unknown [
+
+	^'unknown'
+]
+
+{ #category : #versions }
+GameyeVersion class >> v4 [
+
+	^'v4'
+]
+
+{ #category : #versions }
+GameyeVersion class >> v5 [
+
+	^'v5'
+]
+
+{ #category : #'see class side' }
+GameyeVersion >> seeClassSide [ 
+]