Merge pull request #57 from pharo-graphics/56-Make-AeCanvasTestrender…

…Form-independent-of-Pharos-big-icon Make tests independent of Pharo icons
pharo-graphics · May 2, 2024 · 4d7d79b · 4d7d79b
2 parents 847d26a + adddc18
commit 4d7d79b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/src/Alexandrie-Cairo-Tests/AeCairoExamplesRenderTest.class.st b/src/Alexandrie-Cairo-Tests/AeCairoExamplesRenderTest.class.st
@@ -93,7 +93,7 @@ AeCairoExamplesRenderTest >> surfaceWithAllOperators [
 AeCairoExamplesRenderTest >> surfaceWithColoredIcons [
 
 	| inputForm inputSurface outputColors outputSurface outputContext |
-	inputForm := self iconNamed: #windowClose.
+	inputForm := Form fromFileNamed: AeFilesystemResources removeIconPNG.
 	inputSurface := AeCairoImageSurface fromForm: inputForm.
 
 	outputColors := Color wheel: 7.
@@ -352,7 +352,7 @@ AeCairoExamplesRenderTest >> surfaceWithGouraudBasedTriangle [
 AeCairoExamplesRenderTest >> surfaceWithPixelatedIcon [
 
 	| iconForm iconSurface iconPattern scale aSurface aContext |
-	iconForm := Smalltalk ui icons iconNamed: #removeIcon.
+	iconForm := Form fromFileNamed: AeFilesystemResources removeIconPNG.
 	iconSurface := AeCairoImageSurface fromForm: iconForm.
 	iconPattern := AeCairoSurfacePattern surface: iconSurface.
 	scale := 5.0.
@@ -604,10 +604,9 @@ AeCairoExamplesRenderTest >> surfaceWithStraightEdgesCurve [
 AeCairoExamplesRenderTest >> surfaceWithStretchedIcon [
 
 	| aSurface aContext iconForm iconSurface iconPattern horizontalScale verticalScale |
-	iconForm := Smalltalk ui icons iconNamed: #classIcon.
-	self assert: iconForm extent = (16@16).
+	iconForm := Form fromFileNamed: AeFilesystemResources removeIconPNG.
 	horizontalScale := 0.5.
-	verticalScale := 4.0.
+	verticalScale := 2.0.
 
 	iconSurface := AeCairoImageSurface fromForm: iconForm.
 	iconPattern := AeCairoSurfacePattern surface: iconSurface.

diff --git a/src/Alexandrie-Cairo-Tests/AeCairoImageSurfaceTest.class.st b/src/Alexandrie-Cairo-Tests/AeCairoImageSurfaceTest.class.st
@@ -41,7 +41,7 @@ AeCairoImageSurfaceTest >> testExtentFormat [
 AeCairoImageSurfaceTest >> testFromForm [
 
 	| aForm |
-	aForm := Smalltalk ui icons iconNamed: #classIcon.
+	aForm := Form fromFileNamed: AeFilesystemResources removeIconPNG.
 	surface := AeCairoImageSurface fromForm: aForm.
 
 	self assert: surface extent equals: aForm extent

diff --git a/src/Alexandrie-Cairo-Tests/AeFilesystemResources.extension.st b/src/Alexandrie-Cairo-Tests/AeFilesystemResources.extension.st
@@ -5,3 +5,15 @@ AeFilesystemResources class >> cairoDirectory [
 
 	^ self testsDirectory / 'cairo'
 ]
+
+{ #category : #'*Alexandrie-Cairo-Tests' }
+AeFilesystemResources class >> imagesDirectory [ 
+
+	^ self testsDirectory / 'images'
+]
+
+{ #category : #'*Alexandrie-Cairo-Tests' }
+AeFilesystemResources class >> removeIconPNG [
+
+	^ self imagesDirectory / 'removeIcon.png'
+]
diff --git a/src/Alexandrie-Canvas-Tests/AeCanvasTest.class.st b/src/Alexandrie-Canvas-Tests/AeCanvasTest.class.st
@@ -328,10 +328,10 @@ AeCanvasTest >> renderEmoji [
 AeCanvasTest >> renderForm [
 
 	| aeCanvas aForm |
-	aeCanvas := AeCanvas extent: 50@75.
+	aeCanvas := AeCanvas extent: 60@20.
 	aeCanvas clear: Color paleGreen.
 
-	aForm := Smalltalk ui icons iconNamed: #pharoBig.
+	aForm := Form fromFileNamed: AeFilesystemResources removeIconPNG.
 
 	aeCanvas pathScale: (aeCanvas extent / aForm extent) asFloatPoint.
 	aeCanvas pathFactory: [ :cairoContext |

diff --git a/tests/cairo/surfaceWithColoredIcons.png b/tests/cairo/surfaceWithColoredIcons.png
diff --git a/tests/cairo/surfaceWithStretchedIcon.png b/tests/cairo/surfaceWithStretchedIcon.png
diff --git a/tests/canvas/renderForm.png b/tests/canvas/renderForm.png
diff --git a/tests/images/removeIcon.png b/tests/images/removeIcon.png