From aeae9af0e4ac1f0ac6a200e17aeaa5eab932d8f5 Mon Sep 17 00:00:00 2001 From: dkf Date: Mon, 20 Jul 2009 22:56:43 +0000 Subject: Fix [Bug 2824378] by correcting expected output. --- ChangeLog | 5 +++++ tests/clipboard.test | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index db9e434..6b43509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-20 Donal K. Fellows + + * tests/clipboard.test (clipboard-6.2): [Bug 2824378]: Corrected + result of test in light of changes to binary selection retrieval. + 2009-07-18 Donal K. Fellows * unix/tkUnixSelect.c (SelCvtFromX32, SelCvtFromX8): Make the diff --git a/tests/clipboard.test b/tests/clipboard.test index 8c31971..370400d 100644 --- a/tests/clipboard.test +++ b/tests/clipboard.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: clipboard.test,v 1.11 2008/08/12 22:52:23 aniap Exp $ +# RCS: @(#) $Id: clipboard.test,v 1.12 2009/07/20 22:56:43 dkf Exp $ # # Note: Multiple display clipboard handling will only be tested if the @@ -26,7 +26,7 @@ foreach i {a b c d e f g j h i j k l m o p q r s t u v w x y z} { } # Now we start the main body of the test code - + test clipboard-1.1 {ClipboardHandler procedure} -setup { clipboard clear } -body { @@ -242,7 +242,7 @@ test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints unix -setup { } -cleanup { clipboard clear cleanupbg -} -result {0x10} +} -result {0x10 } test clipboard-6.3 {Tk_ClipboardAppend procedure} -setup { clipboard clear } -body { @@ -308,7 +308,6 @@ test clipboard-7.10 {Tk_ClipboardCmd procedure} -body { test clipboard-7.11 {Tk_ClipboardCmd procedure} -body { clipboard append -displayof foo "test" } -returnCodes error -result {bad window path name "foo"} - test clipboard-7.12 {Tk_ClipboardCmd procedure} -body { clipboard clear -displayof } -returnCodes error -result {wrong # args: should be "clipboard clear ?-displayof window?"} @@ -321,11 +320,9 @@ test clipboard-7.14 {Tk_ClipboardCmd procedure} -body { test clipboard-7.15 {Tk_ClipboardCmd procedure} -body { clipboard clear -displayof foo } -returnCodes error -result {bad window path name "foo"} - test clipboard-7.16 {Tk_ClipboardCmd procedure} -body { clipboard error } -returnCodes error -result {bad option "error": must be append, clear, or get} - test clipboard-7.17 {Tk_ClipboardCmd procedure} -setup { clipboard clear } -body { @@ -356,10 +353,11 @@ test clipboard-7.20 {Tk_ClipboardCmd procedure} -setup { } -cleanup { clipboard clear } -result {-type} + # cleanup cleanupTests return - - - +# Local Variables: +# mode: tcl +# End: -- cgit v0.12