From c32927bfeadf6c18c21d62a7ade87e57e7c61361 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 10 May 2009 18:54:56 -0500 Subject: [PATCH] Fix unit test failures caused by change to 'contents' word --- basis/base64/base64-tests.factor | 2 +- basis/urls/encoding/encoding-tests.factor | 4 ++-- basis/urls/urls.factor | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/basis/base64/base64-tests.factor b/basis/base64/base64-tests.factor index 9094286575..e962fa7e59 100644 --- a/basis/base64/base64-tests.factor +++ b/basis/base64/base64-tests.factor @@ -4,7 +4,7 @@ IN: base64.tests [ "abcdefghijklmnopqrstuvwxyz" ] [ "abcdefghijklmnopqrstuvwxyz" ascii encode >base64 base64> ascii decode ] unit-test -[ f ] [ "" ascii encode >base64 base64> ascii decode ] unit-test +[ "" ] [ "" ascii encode >base64 base64> ascii decode ] unit-test [ "a" ] [ "a" ascii encode >base64 base64> ascii decode ] unit-test [ "ab" ] [ "ab" ascii encode >base64 base64> ascii decode ] unit-test [ "abc" ] [ "abc" ascii encode >base64 base64> ascii decode ] unit-test diff --git a/basis/urls/encoding/encoding-tests.factor b/basis/urls/encoding/encoding-tests.factor index 78e31a764d..f3e0497588 100644 --- a/basis/urls/encoding/encoding-tests.factor +++ b/basis/urls/encoding/encoding-tests.factor @@ -2,8 +2,8 @@ IN: urls.encoding.tests USING: urls.encoding tools.test arrays kernel assocs present accessors ; [ "~hello world" ] [ "%7ehello world" url-decode ] unit-test -[ f ] [ "%XX%XX%XX" url-decode ] unit-test -[ f ] [ "%XX%XX%X" url-decode ] unit-test +[ "" ] [ "%XX%XX%XX" url-decode ] unit-test +[ "" ] [ "%XX%XX%X" url-decode ] unit-test [ "hello world" ] [ "hello%20world" url-decode ] unit-test [ " ! " ] [ "%20%21%20" url-decode ] unit-test diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor index 1e886ae3e2..a72fac567a 100644 --- a/basis/urls/urls.factor +++ b/basis/urls/urls.factor @@ -25,12 +25,14 @@ TUPLE: url protocol username password host port path query anchor ; ] if ; : parse-host ( string -- host port ) - ":" split1 [ url-decode ] [ - dup [ - string>number - dup [ "Invalid port" throw ] unless - ] when - ] bi* ; + [ + ":" split1 [ url-decode ] [ + dup [ + string>number + dup [ "Invalid port" throw ] unless + ] when + ] bi* + ] [ f f ] if* ; GENERIC: >url ( obj -- url ) -- 2.34.1