More robust image name resolution. Added test for image name.

Bajger · Feb 2, 2024 · 7784c5d · 7784c5d
1 parent 6ef66cb
commit 7784c5d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/PharoLauncher-Core/PhLImageProcess.class.st b/src/PharoLauncher-Core/PhLImageProcess.class.st
@@ -37,9 +37,11 @@ PhLImageProcess class >> newFrom: osOutputLine [
 { #category : #accessing }
 PhLImageProcess >> imageName [
 
-
+	|fileName|
 	self imagePath ifEmpty: [ ^ '' ].
-	^ (self imagePath copyAfterLast: FileSystem disk delimiter) copyUpTo: $.
+	fileName := self imagePath copyAfterLast: FileSystem disk delimiter.
+	fileName ifEmpty: [ fileName := self imagePath  ].
+	^ fileName  copyUpTo: $.
 ]
 
 { #category : #accessing }

diff --git a/src/PharoLauncher-Tests-Core/PhLImageProcessTest.class.st b/src/PharoLauncher-Tests-Core/PhLImageProcessTest.class.st
@@ -7,6 +7,41 @@ Class {
 	#category : #'PharoLauncher-Tests-Core'
 }
 
+{ #category : #private }
+PhLImageProcessTest >> imagePathNameCandidates [
+
+	|paths delimiter| 
+	paths := OrderedCollection new.
+	delimiter := FileSystem disk delimiter.
+
+	paths add: (String streamContents: [:aStream | 
+		aStream nextPutAll:  'some';
+			nextPut: delimiter;
+			nextPutAll: 'very';
+			nextPut: delimiter;
+			nextPutAll: 'long';
+			nextPut: delimiter;
+			nextPutAll: 'path';
+			nextPut: delimiter;
+			nextPutAll: 'myImage1.image'
+		]
+	).
+	paths add: 'myImage2.image'.
+	^ paths
+]
+
+{ #category : #tests }
+PhLImageProcessTest >> testImageName [
+
+	| imageNames |
+	imageNames := self imagePathNameCandidates collect: [:aPath |
+		PhLImageProcess new
+			imagePath: aPath;
+			imageName 
+	].
+	self assert: (imageNames includesAll: #('myImage1' 'myImage2')).
+]
+
 { #category : #tests }
 PhLImageProcessTest >> testNewFrom [