Adjust autotest files for raster engine to new default pen

Fix those test scripts that assumed cosmetic default pen, and
improve testing coverage of cosmetic vs non-cosmetic pens in general.
Ref. I04d910e9700baf7f13a8aac07a3633014bb9283e

Change-Id: I2bb3525c21a8e9c8dd1f16e7dcd225195df43c1b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

diff --git a/tests/auto/other/lancelot/scripts/arcs.qps b/tests/auto/other/lancelot/scripts/arcs.qps
index 8a7a468..8afaf73 100644 (file)
--- a/tests/auto/other/lancelot/scripts/arcs.qps
+++ b/tests/auto/other/lancelot/scripts/arcs.qps
@@ -3,7 +3,7 @@
 
 setRenderHint LineAntialiasing
 
-setPen red
+setPen red 0
 
 drawEllipse 0 0 600 400
 
@@ -59,7 +59,7 @@ drawPath arcs
 translate 200 400
 rotate 10
 scale 0.5 0.5
-setPen red
+setPen red 0
 setBrush nobrush
 drawEllipse 0 0 600 400
 

diff --git a/tests/auto/other/lancelot/scripts/beziers.qps b/tests/auto/other/lancelot/scripts/beziers.qps
index 9b47cd0..62d9d03 100644 (file)
--- a/tests/auto/other/lancelot/scripts/beziers.qps
+++ b/tests/auto/other/lancelot/scripts/beziers.qps
@@ -1,9 +1,10 @@
 # Version: 1
 # CheckVsReference: 5%
 
-
 setRenderHint LineAntialiasing
 
+setPen green 0
+
 translate 20 20
 path_moveTo fullSize 0 0
 path_cubicTo fullSize 200 100 -100 100 100 0

diff --git a/tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps b/tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
index b463014..96405ce 100644 (file)
--- a/tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
+++ b/tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
@@ -16,53 +16,53 @@ scale 2 2
 
 setPen black 10 solidline roundcap roundjoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate 100 0
 setPen black 10 solidline roundcap miterjoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate 100 0
 setPen black 10 solidline roundcap beveljoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate -200 100
 setPen black 10 solidline squarecap roundjoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate 100 0
 setPen black 10 solidline squarecap miterjoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate 100 0
 setPen black 10 solidline squarecap beveljoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate -200 100
 setPen black 10 solidline flatcap roundjoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate 100 0
 setPen black 10 solidline flatcap miterjoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
 
 translate 100 0
 setPen black 10 solidline flatcap beveljoin
 drawPath p
-setPen red
+setPen red 0
 drawPath p
\ No newline at end of file

diff --git a/tests/auto/other/lancelot/scripts/lines.qps b/tests/auto/other/lancelot/scripts/lines.qps
index c0daffb..274a7f3 100644 (file)
--- a/tests/auto/other/lancelot/scripts/lines.qps
+++ b/tests/auto/other/lancelot/scripts/lines.qps
@@ -1,7 +1,6 @@
 # Version: 1
 # CheckVsReference: 5% (0 0 310 425)
 
-
 translate 10 10
 
 begin_block draw_lines
@@ -260,132 +259,8 @@ save
   repeat_block draw_lines
 restore
 
-translate 320 0
-
-setPen black 0 solidline squarecap
-
-begin_block lines
-
-# 0 -> 45 degress
-drawLine 100 100 200 90
-drawLine 100 100 200 80
-drawLine 100 100 200 70
-drawLine 100 100 200 60
-drawLine 100 100 200 50
-drawLine 100 100 200 40
-drawLine 100 100 200 30
-drawLine 100 100 200 20
-drawLine 100 100 200 10
-
-# 45
-drawLine 100 100 200 0
-
-# 45 -> 90
-drawLine 100 100 190 0
-drawLine 100 100 180 0
-drawLine 100 100 170 0
-drawLine 100 100 160 0
-drawLine 100 100 150 0
-drawLine 100 100 140 0
-drawLine 100 100 130 0
-drawLine 100 100 120 0
-drawLine 100 100 110 0
-
-# 90 
-drawLine 100 100 100 0
-
-# 90 -> 135
-drawLine 100 100 90 0
-drawLine 100 100 80 0
-drawLine 100 100 70 0
-drawLine 100 100 60 0
-drawLine 100 100 50 0
-drawLine 100 100 40 0
-drawLine 100 100 30 0
-drawLine 100 100 20 0
-drawLine 100 100 10 0
-
-# 135 
-drawLine 100 100 0 0
-
-# 135 -> 180 degress
-drawLine 100 100 0 10
-drawLine 100 100 0 20
-drawLine 100 100 0 30
-drawLine 100 100 0 40
-drawLine 100 100 0 50
-drawLine 100 100 0 60
-drawLine 100 100 0 70
-drawLine 100 100 0 80
-drawLine 100 100 0 90
-
-# 180 
-drawLine 100 100 0 100
-
-# 180 -> 225
-drawLine 100 100 0 110
-drawLine 100 100 0 120
-drawLine 100 100 0 130
-drawLine 100 100 0 140
-drawLine 100 100 0 150
-drawLine 100 100 0 160
-drawLine 100 100 0 170
-drawLine 100 100 0 180
-drawLine 100 100 0 190
-
-# 225 
-drawLine 100 100 0 200
-
-# 225 -> 270
-drawLine 100 100 10 200
-drawLine 100 100 20 200
-drawLine 100 100 30 200
-drawLine 100 100 40 200
-drawLine 100 100 50 200
-drawLine 100 100 60 200
-drawLine 100 100 70 200
-drawLine 100 100 80 200
-drawLine 100 100 90 200
-
-# 270
-drawLine 100 100 100 200
-
-# 270 -> 315 degrees
-drawLine 100 100 110 200
-drawLine 100 100 120 200
-drawLine 100 100 130 200
-drawLine 100 100 140 200
-drawLine 100 100 150 200
-drawLine 100 100 160 200
-drawLine 100 100 170 200
-drawLine 100 100 180 200
-drawLine 100 100 190 200
-
-# 315 
-drawLine 100 100 200 200
-
-# 315 -> 360 degress
-drawLine 100 100 200 100
-drawLine 100 100 200 110
-drawLine 100 100 200 120
-drawLine 100 100 200 130
-drawLine 100 100 200 140
-drawLine 100 100 200 150
-drawLine 100 100 200 160
-drawLine 100 100 200 170
-drawLine 100 100 200 180
-drawLine 100 100 200 190
-
-end_block
-
-
-setRenderHint Antialiasing
-setPen 0x7fff0000 
-translate 0.5 0.5
-repeat_block lines
-
 setPen 0x000000 8
-translate 20 240
+translate 350 240
 drawText 0 0 "Steep slopes:"
 
 translate 0 10
@@ -555,4 +430,4 @@ drawRect 0.5 0.5 64 64
 setPen red 2 solidline flatcap
 
 setClipRect 2 2 63 63
-drawLine 1.5 1.5 33560000 33560000
\ No newline at end of file
+drawLine 1.5 1.5 33560000 33560000

diff --git a/tests/auto/other/lancelot/scripts/lines3.qps b/tests/auto/other/lancelot/scripts/lines3.qps
new file mode 100644 (file)
index 0000000..676235e
--- /dev/null
+++ b/tests/auto/other/lancelot/scripts/lines3.qps
@@ -0,0 +1,171 @@
+
+clearRenderHint
+setPen black 0 solidline squarecap
+
+save
+translate 20 20
+
+begin_block lines
+
+# 0 -> 45 degress
+drawLine 100 100 200 90
+drawLine 100 100 200 80
+drawLine 100 100 200 70
+drawLine 100 100 200 60
+drawLine 100 100 200 50
+drawLine 100 100 200 40
+drawLine 100 100 200 30
+drawLine 100 100 200 20
+drawLine 100 100 200 10
+
+# 45
+drawLine 100 100 200 0
+
+# 45 -> 90
+drawLine 100 100 190 0
+drawLine 100 100 180 0
+drawLine 100 100 170 0
+drawLine 100 100 160 0
+drawLine 100 100 150 0
+drawLine 100 100 140 0
+drawLine 100 100 130 0
+drawLine 100 100 120 0
+drawLine 100 100 110 0
+
+# 90
+drawLine 100 100 100 0
+
+# 90 -> 135
+drawLine 100 100 90 0
+drawLine 100 100 80 0
+drawLine 100 100 70 0
+drawLine 100 100 60 0
+drawLine 100 100 50 0
+drawLine 100 100 40 0
+drawLine 100 100 30 0
+drawLine 100 100 20 0
+drawLine 100 100 10 0
+
+# 135
+drawLine 100 100 0 0
+
+# 135 -> 180 degress
+drawLine 100 100 0 10
+drawLine 100 100 0 20
+drawLine 100 100 0 30
+drawLine 100 100 0 40
+drawLine 100 100 0 50
+drawLine 100 100 0 60
+drawLine 100 100 0 70
+drawLine 100 100 0 80
+drawLine 100 100 0 90
+
+# 180
+drawLine 100 100 0 100
+
+# 180 -> 225
+drawLine 100 100 0 110
+drawLine 100 100 0 120
+drawLine 100 100 0 130
+drawLine 100 100 0 140
+drawLine 100 100 0 150
+drawLine 100 100 0 160
+drawLine 100 100 0 170
+drawLine 100 100 0 180
+drawLine 100 100 0 190
+
+# 225
+drawLine 100 100 0 200
+
+# 225 -> 270
+drawLine 100 100 10 200
+drawLine 100 100 20 200
+drawLine 100 100 30 200
+drawLine 100 100 40 200
+drawLine 100 100 50 200
+drawLine 100 100 60 200
+drawLine 100 100 70 200
+drawLine 100 100 80 200
+drawLine 100 100 90 200
+
+# 270
+drawLine 100 100 100 200
+
+# 270 -> 315 degrees
+drawLine 100 100 110 200
+drawLine 100 100 120 200
+drawLine 100 100 130 200
+drawLine 100 100 140 200
+drawLine 100 100 150 200
+drawLine 100 100 160 200
+drawLine 100 100 170 200
+drawLine 100 100 180 200
+drawLine 100 100 190 200
+
+# 315
+drawLine 100 100 200 200
+
+# 315 -> 360 degress
+drawLine 100 100 200 100
+drawLine 100 100 200 110
+drawLine 100 100 200 120
+drawLine 100 100 200 130
+drawLine 100 100 200 140
+drawLine 100 100 200 150
+drawLine 100 100 200 160
+drawLine 100 100 200 170
+drawLine 100 100 200 180
+drawLine 100 100 200 190
+
+end_block
+
+setRenderHint Antialiasing
+setPen 0x7fff0000 0 solidline squarecap
+repeat_block lines
+
+translate 250.5 0.5
+clearRenderHint
+setPen black 0 solidline squarecap
+repeat_block lines
+setRenderHint Antialiasing
+setPen 0x7fff0000 0 solidline squarecap
+repeat_block lines
+
+restore
+
+save
+
+translate 20 250
+clearRenderHint
+setPen black 1 solidline squarecap
+repeat_block lines
+setRenderHint Antialiasing
+setPen 0x7fff0000 1 solidline squarecap
+repeat_block lines
+
+translate 250.5 0.5
+clearRenderHint
+setPen black 1 soslidline squarecap
+repeat_block lines
+setRenderHint Antialiasing
+setPen 0x7fff0000 0 solidline squarecap
+repeat_block lines
+
+restore
+
+translate 20 500
+scale 1.5 1.5
+clearRenderHint
+setPen black 1 solidline squarecap
+repeat_block lines
+setRenderHint Antialiasing
+setPen 0x7fff0000 1 solidline squarecap
+repeat_block lines
+
+translate 250.5 0.5
+clearRenderHint
+setPen black 1 soslidline squarecap
+repeat_block lines
+setRenderHint Antialiasing
+setPen 0x7fff0000 0 solidline squarecap
+repeat_block lines

diff --git a/tests/auto/other/lancelot/scripts/paths.qps b/tests/auto/other/lancelot/scripts/paths.qps
index 555390d..454b2a0 100644 (file)
--- a/tests/auto/other/lancelot/scripts/paths.qps
+++ b/tests/auto/other/lancelot/scripts/paths.qps
@@ -1,8 +1,12 @@
 # Version: 1
 
-setPen black
+setPen black 1
 setBrush 7f7fff
 
+setFont "arial" 12
+drawText 10 330 "Non-Cosmetic"
+drawText 10 730 "Cosmetic"
+
 path_moveTo star 50 0
 path_lineTo star 30 90
 path_lineTo star 100 60
@@ -29,6 +33,17 @@ translate -200 100
 drawPath text
 end_block
 
-translate 50 100
+begin_block xform
+save
+translate 50 60
 rotate 10
+scale 1.0 0.7
+repeat_block drawing
+restore
+end_block xform
+
+setPen black 0
+setBrush ff7f7f
+translate 0 300
 repeat_block drawing
+repeat_block xform

diff --git a/tests/auto/other/lancelot/scripts/pens_cosmetic.qps b/tests/auto/other/lancelot/scripts/pens_cosmetic.qps
index d1a60d1..9120290 100644 (file)
--- a/tests/auto/other/lancelot/scripts/pens_cosmetic.qps
+++ b/tests/auto/other/lancelot/scripts/pens_cosmetic.qps
@@ -6,6 +6,9 @@ path_addRect path 25 5 4 4
 
 translate 20 20
 
+setPen black 0
+pen_setCosmetic false
+
 begin_block lines
   save
     drawLine 0 0 10 10
@@ -58,6 +61,7 @@ drawText 580 15 "non-cosmetic, 0-width"
 translate 0 50
 
 setPen black 2
+pen_setCosmetic false
 repeat_block lines
 drawText 580 15 "non-cosmetic, 2-width"
 
@@ -80,12 +84,14 @@ translate 0 20
 
 translate 0 50
 setPen black 0
+pen_setCosmetic false
 repeat_block lines
 drawText 580 15 "non-cosmetic, 0-width"
 
 translate 0 50
 
 setPen black 2
+pen_setCosmetic false
 repeat_block lines
 drawText 580 15 "non-cosmetic, 2-width"