From 7e4910d2ad9549b5df3aff16f1800b9f4236a851 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 19 Dec 2008 15:33:40 +0000 Subject: * tests/clrpick.test: Eliminate duplicate test names. * tests/embed.test: * tests/text.test: * tests/textMark.test: --- ChangeLog | 5 +++++ tests/clrpick.test | 6 +++--- tests/embed.test | 10 +++++----- tests/text.test | 4 ++-- tests/textMark.test | 4 ++-- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bf60a1..6d1bcec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-12-19 Don Porter + * tests/clrpick.test: Eliminate duplicate test names. + * tests/embed.test: + * tests/text.test: + * tests/textMark.test: + * README: Bump version number to 8.6b1 * generic/tk.h: * library/tk.tcl: diff --git a/tests/clrpick.test b/tests/clrpick.test index 0502a69..7a94b97 100644 --- a/tests/clrpick.test +++ b/tests/clrpick.test @@ -5,7 +5,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: clrpick.test,v 1.14 2008/08/15 01:10:03 aniap Exp $ +# RCS: @(#) $Id: clrpick.test,v 1.15 2008/12/19 15:33:40 dgp Exp $ # package require tcltest 2.2 @@ -54,10 +54,10 @@ test clrpick-1.1 {tk_chooseColor command} -body { test clrpick-1.2 {tk_chooseColor command } -body { tk_chooseColor -initialcolor } -returnCodes error -result {value for "-initialcolor" missing} -test clrpick-1.2 {tk_chooseColor command } -body { +test clrpick-1.2.1 {tk_chooseColor command } -body { tk_chooseColor -parent } -returnCodes error -result {value for "-parent" missing} -test clrpick-1.2 {tk_chooseColor command } -body { +test clrpick-1.2.2 {tk_chooseColor command } -body { tk_chooseColor -title } -returnCodes error -result {value for "-title" missing} diff --git a/tests/embed.test b/tests/embed.test index db486f0..79f47b2 100644 --- a/tests/embed.test +++ b/tests/embed.test @@ -4,7 +4,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: embed.test,v 1.5 2008/08/12 22:52:23 aniap Exp $ +# RCS: @(#) $Id: embed.test,v 1.6 2008/12/19 15:33:40 dgp Exp $ package require tcltest 2.2 namespace import ::tcltest::* @@ -38,7 +38,7 @@ test embed-1.3 {CreateFrame procedure, both -use and -container is invalid} -set } -returnCodes error -result {A window cannot have both the -use and the -container option set.} # testing window embedding for win platforms -test embed-1.4 {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints { win } -setup { deleteWindows @@ -49,7 +49,7 @@ test embed-1.4 {TkpUseWindow procedure, -container must be set} -constraints { deleteWindows } -returnCodes error -result {the window to use is not a Tk container} # testing window embedding for win platforms -test embed-1.5 {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.5.win {TkpUseWindow procedure, -container must be set} -constraints { win } -setup { deleteWindows @@ -61,7 +61,7 @@ test embed-1.5 {TkpUseWindow procedure, -container must be set} -constraints { } -returnCodes error -result {the window to use is not a Tk container} # testing window embedding for other than win platforms -test embed-1.5 {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.4.nonwin {TkpUseWindow procedure, -container must be set} -constraints { nonwin } -setup { deleteWindows @@ -72,7 +72,7 @@ test embed-1.5 {TkpUseWindow procedure, -container must be set} -constraints { deleteWindows } -returnCodes error -result {window ".container" doesn't have -container option set} # testing window embedding for other than win platforms -test embed-1.6 {TkpUseWindow procedure, -container must be set} -constraints { +test embed-1.5.nonwin {TkpUseWindow procedure, -container must be set} -constraints { nonwin } -setup { deleteWindows diff --git a/tests/text.test b/tests/text.test index 896a997..8fd077d 100644 --- a/tests/text.test +++ b/tests/text.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: text.test,v 1.53 2008/12/06 10:48:29 dkf Exp $ +# RCS: @(#) $Id: text.test,v 1.54 2008/12/19 15:33:40 dgp Exp $ package require tcltest 2.2 eval tcltest::configure $argv @@ -811,7 +811,7 @@ test text-1.83 {text options} -setup { } -cleanup { destroy .t } -result {-yscrollcommand yScrollCommand ScrollCommand {} {test command}} -test text-1.83 {configuration option: "insertunfocussed"} -setup { +test text-1.83.1 {configuration option: "insertunfocussed"} -setup { text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold} pack .t update diff --git a/tests/textMark.test b/tests/textMark.test index 9c61c40..62cab1b 100644 --- a/tests/textMark.test +++ b/tests/textMark.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textMark.test,v 1.12 2008/12/06 09:51:55 dkf Exp $ +# RCS: @(#) $Id: textMark.test,v 1.13 2008/12/19 15:33:40 dgp Exp $ package require tcltest 2.2 namespace import ::tcltest::* @@ -114,7 +114,7 @@ test textMark-4.2 {TkTextMarkCmd - "unset" option} -body { .t mark unset a b .t index a } -returnCodes error -result {bad text index "a"} -test textMark-4.2 {TkTextMarkCmd - "unset" option} -body { +test textMark-4.2.1 {TkTextMarkCmd - "unset" option} -body { .t mark set a 1.2 .t mark set b 2.3 .t mark unset a b -- cgit v0.12