From f26bf45b4a45e7342bd5225287b0afff5d7ad133 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 15 Apr 2010 13:48:13 -0500 Subject: [PATCH] formatting: fix unit tests on Windows; libc's float formatting produces different output there --- basis/formatting/formatting-tests.factor | 148 +++++++++++------------ 1 file changed, 74 insertions(+), 74 deletions(-) mode change 100644 => 100755 basis/formatting/formatting-tests.factor diff --git a/basis/formatting/formatting-tests.factor b/basis/formatting/formatting-tests.factor old mode 100644 new mode 100755 index 35b1dfff4a..740babf866 --- a/basis/formatting/formatting-tests.factor +++ b/basis/formatting/formatting-tests.factor @@ -1,83 +1,85 @@ ! Copyright (C) 2008 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: calendar kernel formatting tools.test ; +USING: calendar kernel formatting tools.test system ; IN: formatting.tests [ "%s" printf ] must-infer [ "%s" sprintf ] must-infer -[ t ] [ "" "" sprintf = ] unit-test -[ t ] [ "asdf" "asdf" sprintf = ] unit-test -[ t ] [ "10" 10 "%d" sprintf = ] unit-test -[ t ] [ "+10" 10 "%+d" sprintf = ] unit-test -[ t ] [ "-10" -10 "%d" sprintf = ] unit-test -[ t ] [ " -10" -10 "%5d" sprintf = ] unit-test -[ t ] [ "-0010" -10 "%05d" sprintf = ] unit-test -[ t ] [ "+0010" 10 "%+05d" sprintf = ] unit-test -[ t ] [ "123.456000" 123.456 "%f" sprintf = ] unit-test -[ t ] [ "2.44" 2.436 "%.2f" sprintf = ] unit-test -[ t ] [ "8.950" 8.950179003580072 "%.3f" sprintf = ] unit-test -[ t ] [ "123.10" 123.1 "%01.2f" sprintf = ] unit-test -[ t ] [ "1.2346" 1.23456789 "%.4f" sprintf = ] unit-test -[ t ] [ " 1.23" 1.23456789 "%6.2f" sprintf = ] unit-test -[ t ] [ "1.234000e+08" 123400000 "%e" sprintf = ] unit-test -[ t ] [ "-1.234000e+08" -123400000 "%e" sprintf = ] unit-test -[ t ] [ "1.234567e+08" 123456700 "%e" sprintf = ] unit-test -[ t ] [ "3.625e+08" 362525200 "%.3e" sprintf = ] unit-test -[ t ] [ "2.500000e-03" 0.0025 "%e" sprintf = ] unit-test -[ t ] [ "2.500000E-03" 0.0025 "%E" sprintf = ] unit-test -[ t ] [ " 1.0E+01" 10 "%10.1E" sprintf = ] unit-test -[ t ] [ " -1.0E+01" -10 "%10.1E" sprintf = ] unit-test -[ t ] [ " -1.0E+01" -10 "%+10.1E" sprintf = ] unit-test -[ t ] [ " +1.0E+01" 10 "%+10.1E" sprintf = ] unit-test -[ t ] [ "-001.0E+01" -10 "%+010.1E" sprintf = ] unit-test -[ t ] [ "+001.0E+01" 10 "%+010.1E" sprintf = ] unit-test -[ t ] [ "ff" HEX: ff "%x" sprintf = ] unit-test -[ t ] [ "FF" HEX: ff "%X" sprintf = ] unit-test -[ t ] [ "0f" HEX: f "%02x" sprintf = ] unit-test -[ t ] [ "0F" HEX: f "%02X" sprintf = ] unit-test -[ t ] [ "2008-09-10" - 2008 9 10 "%04d-%02d-%02d" sprintf = ] unit-test -[ t ] [ "Hello, World!" - "Hello, World!" "%s" sprintf = ] unit-test -[ t ] [ "printf test" - "printf test" sprintf = ] unit-test -[ t ] [ "char a = 'a'" - CHAR: a "char %c = 'a'" sprintf = ] unit-test -[ t ] [ "00" HEX: 0 "%02x" sprintf = ] unit-test -[ t ] [ "ff" HEX: ff "%02x" sprintf = ] unit-test -[ t ] [ "0 message(s)" - 0 "message" "%d %s(s)" sprintf = ] unit-test -[ t ] [ "0 message(s) with %" - 0 "message" "%d %s(s) with %%" sprintf = ] unit-test -[ t ] [ "justif: \"left \"" - "left" "justif: \"%-10s\"" sprintf = ] unit-test -[ t ] [ "justif: \" right\"" - "right" "justif: \"%10s\"" sprintf = ] unit-test -[ t ] [ " 3: 0003 zero padded" - 3 " 3: %04d zero padded" sprintf = ] unit-test -[ t ] [ " 3: 3 left justif" - 3 " 3: %-4d left justif" sprintf = ] unit-test -[ t ] [ " 3: 3 right justif" - 3 " 3: %4d right justif" sprintf = ] unit-test -[ t ] [ " -3: -003 zero padded" - -3 " -3: %04d zero padded" sprintf = ] unit-test -[ t ] [ " -3: -3 left justif" - -3 " -3: %-4d left justif" sprintf = ] unit-test -[ t ] [ " -3: -3 right justif" - -3 " -3: %4d right justif" sprintf = ] unit-test -[ t ] [ "There are 10 monkeys in the kitchen" - 10 "kitchen" "There are %d monkeys in the %s" sprintf = ] unit-test -[ f ] [ "%d" 10 "%d" sprintf = ] unit-test -[ t ] [ "[monkey]" "monkey" "[%s]" sprintf = ] unit-test -[ t ] [ "[ monkey]" "monkey" "[%10s]" sprintf = ] unit-test -[ t ] [ "[monkey ]" "monkey" "[%-10s]" sprintf = ] unit-test -[ t ] [ "[0000monkey]" "monkey" "[%010s]" sprintf = ] unit-test -[ t ] [ "[####monkey]" "monkey" "[%'#10s]" sprintf = ] unit-test -[ t ] [ "[many monke]" "many monkeys" "[%10.10s]" sprintf = ] unit-test +[ "" ] [ "" sprintf ] unit-test +[ "asdf" ] [ "asdf" sprintf ] unit-test +[ "10" ] [ 10 "%d" sprintf ] unit-test +[ "+10" ] [ 10 "%+d" sprintf ] unit-test +[ "-10" ] [ -10 "%d" sprintf ] unit-test +[ " -10" ] [ -10 "%5d" sprintf ] unit-test +[ "-0010" ] [ -10 "%05d" sprintf ] unit-test +[ "+0010" ] [ 10 "%+05d" sprintf ] unit-test +[ "123.456000" ] [ 123.456 "%f" sprintf ] unit-test +[ "2.44" ] [ 2.436 "%.2f" sprintf ] unit-test +[ "8.950" ] [ 8.950179003580072 "%.3f" sprintf ] unit-test +[ "123.10" ] [ 123.1 "%01.2f" sprintf ] unit-test +[ "1.2346" ] [ 1.23456789 "%.4f" sprintf ] unit-test +[ " 1.23" ] [ 1.23456789 "%6.2f" sprintf ] unit-test -[ t ] [ "{ 1, 2, 3 }" { 1 2 3 } "%[%s, %]" sprintf = ] unit-test -[ t ] [ "{ 1:2, 3:4 }" H{ { 1 2 } { 3 4 } } "%[%s: %s %]" sprintf = ] unit-test +os windows? [ + [ "1.234000e+008" ] [ 123400000 "%e" sprintf ] unit-test + [ "-1.234000e+008" ] [ -123400000 "%e" sprintf ] unit-test + [ "1.234567e+008" ] [ 123456700 "%e" sprintf ] unit-test + [ "3.625e+008" ] [ 362525200 "%.3e" sprintf ] unit-test + [ "2.500000e-003" ] [ 0.0025 "%e" sprintf ] unit-test + [ "2.500000E-003" ] [ 0.0025 "%E" sprintf ] unit-test + [ " 1.0E+001" ] [ 10 "%11.1E" sprintf ] unit-test + [ " -1.0E+001" ] [ -10 "%11.1E" sprintf ] unit-test + [ " -1.0E+001" ] [ -10 "%+11.1E" sprintf ] unit-test + [ " +1.0E+001" ] [ 10 "%+11.1E" sprintf ] unit-test + [ "-001.0E+001" ] [ -10 "%+011.1E" sprintf ] unit-test + [ "+001.0E+001" ] [ 10 "%+011.1E" sprintf ] unit-test +] [ + [ "1.234000e+08" ] [ 123400000 "%e" sprintf ] unit-test + [ "-1.234000e+08" ] [ -123400000 "%e" sprintf ] unit-test + [ "1.234567e+08" ] [ 123456700 "%e" sprintf ] unit-test + [ "3.625e+08" ] [ 362525200 "%.3e" sprintf ] unit-test + [ "2.500000e-03" ] [ 0.0025 "%e" sprintf ] unit-test + [ "2.500000E-03" ] [ 0.0025 "%E" sprintf ] unit-test + [ " 1.0E+01" ] [ 10 "%10.1E" sprintf ] unit-test + [ " -1.0E+01" ] [ -10 "%10.1E" sprintf ] unit-test + [ " -1.0E+01" ] [ -10 "%+10.1E" sprintf ] unit-test + [ " +1.0E+01" ] [ 10 "%+10.1E" sprintf ] unit-test + [ "-001.0E+01" ] [ -10 "%+010.1E" sprintf ] unit-test + [ "+001.0E+01" ] [ 10 "%+010.1E" sprintf ] unit-test +] if + +[ "ff" ] [ HEX: ff "%x" sprintf ] unit-test +[ "FF" ] [ HEX: ff "%X" sprintf ] unit-test +[ "0f" ] [ HEX: f "%02x" sprintf ] unit-test +[ "0F" ] [ HEX: f "%02X" sprintf ] unit-test +[ "2008-09-10" ] [ 2008 9 10 "%04d-%02d-%02d" sprintf ] unit-test +[ "Hello, World!" ] [ "Hello, World!" "%s" sprintf ] unit-test +[ "printf test" ] [ "printf test" sprintf ] unit-test +[ "char a = 'a'" ] [ CHAR: a "char %c = 'a'" sprintf ] unit-test +[ "00" ] [ HEX: 0 "%02x" sprintf ] unit-test +[ "ff" ] [ HEX: ff "%02x" sprintf ] unit-test +[ "0 message(s)" ] [ 0 "message" "%d %s(s)" sprintf ] unit-test +[ "0 message(s) with %" ] [ 0 "message" "%d %s(s) with %%" sprintf ] unit-test +[ "justif: \"left \"" ] [ "left" "justif: \"%-10s\"" sprintf ] unit-test +[ "justif: \" right\"" ] [ "right" "justif: \"%10s\"" sprintf ] unit-test +[ " 3: 0003 zero padded" ] [ 3 " 3: %04d zero padded" sprintf ] unit-test +[ " 3: 3 left justif" ] [ 3 " 3: %-4d left justif" sprintf ] unit-test +[ " 3: 3 right justif" ] [ 3 " 3: %4d right justif" sprintf ] unit-test +[ " -3: -003 zero padded" ] [ -3 " -3: %04d zero padded" sprintf ] unit-test +[ " -3: -3 left justif" ] [ -3 " -3: %-4d left justif" sprintf ] unit-test +[ " -3: -3 right justif" ] [ -3 " -3: %4d right justif" sprintf ] unit-test +[ "There are 10 monkeys in the kitchen" ] [ 10 "kitchen" "There are %d monkeys in the %s" sprintf ] unit-test +[ "10" ] [ 10 "%d" sprintf ] unit-test +[ "[monkey]" ] [ "monkey" "[%s]" sprintf ] unit-test +[ "[ monkey]" ] [ "monkey" "[%10s]" sprintf ] unit-test +[ "[monkey ]" ] [ "monkey" "[%-10s]" sprintf ] unit-test +[ "[0000monkey]" ] [ "monkey" "[%010s]" sprintf ] unit-test +[ "[####monkey]" ] [ "monkey" "[%'#10s]" sprintf ] unit-test +[ "[many monke]" ] [ "many monkeys" "[%10.10s]" sprintf ] unit-test + +[ "{ 1, 2, 3 }" ] [ { 1 2 3 } "%[%s, %]" sprintf ] unit-test +[ "{ 1:2, 3:4 }" ] [ H{ { 1 2 } { 3 4 } } "%[%s: %s %]" sprintf ] unit-test [ "%H:%M:%S" strftime ] must-infer @@ -96,5 +98,3 @@ IN: formatting.tests [ t ] [ "October" testtime "%B" strftime = ] unit-test [ t ] [ "Thu Oct 09 12:03:15 2008" testtime "%c" strftime = ] unit-test [ t ] [ "PM" testtime "%p" strftime = ] unit-test - -