From 39cfdaa0524f329527d9ee22d9229ce476560f05 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 30 Nov 2016 21:51:25 +0000
Subject: Fixed [3ee76e41c2] - New textTag test failures

---
 tests/textTag.test | 42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/tests/textTag.test b/tests/textTag.test
index 2df8c5a..a2b2d73 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -11,6 +11,19 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+set textWidgetFont {Courier 12}
+set bigFont        {Helvetica 24}
+
+# what is needed is a specific font *size* because in some tests (that
+# will be constrained by haveFontSizes), a tag applying the $bigFont
+# will be set to some characters, which action has the effect of
+# changing what character is under the mouse pointer, which is the
+# purpose of the tests
+testConstraint haveFontSizes [expr {
+    [font actual $textWidgetFont -size] == 12 &&
+    [font actual $bigFont -size] == 24 }
+]
+
 destroy .t
 text .t -width 20 -height 10
 
@@ -19,7 +32,6 @@ update
 .t debug on
 
 wm geometry . {}
-set bigFont {Helvetica 24}
 
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm, to make mwm forget about a previous minimum size setting.
@@ -1313,9 +1325,13 @@ test textTag-16.1 {TkTextPickCurrent procedure} -setup {
     lappend x [.t index current]
 } -result {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
 
-test textTag-16.2 {TkTextPickCurrent procedure} -setup {
+test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
+    haveFontSizes
+} -setup {
     .t tag delete {*}[.t tag names]
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    set curFont [.t cget -font]
+    .t configure -font $textWidgetFont
 } -body {
     .t tag configure big -font $bigFont
     event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
@@ -1326,6 +1342,7 @@ test textTag-16.2 {TkTextPickCurrent procedure} -setup {
     lappend x [.t index current]
 } -cleanup {
     .t tag delete big
+    .t configure -font $curFont
 } -result {3.2 3.1}
 
 test textTag-16.3 {TkTextPickCurrent procedure} -setup {
@@ -1381,11 +1398,15 @@ test textTag-16.4 {TkTextPickCurrent procedure} -setup {
     .t tag delete {*}[.t tag names]
 } -result {enter-a enter-b enter-c | leave-c leave-b}
 
-test textTag-16.5 {TkTextPickCurrent procedure} -setup {
+test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
+    haveFontSizes
+} -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    set curFont [.t cget -font]
+    .t configure -font $textWidgetFont
 } -body {
     .t tag configure big -font $bigFont
     event gen .t <Motion> -x $x1 -y $y1
@@ -1395,13 +1416,18 @@ test textTag-16.5 {TkTextPickCurrent procedure} -setup {
     .t index current
 } -cleanup {
     .t tag delete a big
+    .t configure -font $curFont
 } -result {3.2}
 
-test textTag-16.6 {TkTextPickCurrent procedure} -setup {
+test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
+    haveFontSizes
+} -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    set curFont [.t cget -font]
+    .t configure -font $textWidgetFont
 } -body {
     .t tag configure big -font $bigFont
     event gen .t <Motion> -x $x1 -y $y1
@@ -1412,13 +1438,18 @@ test textTag-16.6 {TkTextPickCurrent procedure} -setup {
     .t index current
 } -cleanup {
     .t tag delete a big
+    .t configure -font $curFont
 } -result {3.1}
 
-test textTag-16.7 {TkTextPickCurrent procedure} -setup {
+test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
+    haveFontSizes
+} -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    set curFont [.t cget -font]
+    .t configure -font $textWidgetFont
 } -body {
     .t tag configure big -font $bigFont
     .t tag bind a <Enter> {.t tag add big 3.0 3.2}
@@ -1432,6 +1463,7 @@ test textTag-16.7 {TkTextPickCurrent procedure} -setup {
     .t index current
 } -cleanup {
     .t tag delete a big
+    .t configure -font $curFont
 } -result {3.1}
 
 
-- 
cgit v0.12