steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unit test failures caused by change to 'contents' word

db4
Slava Pestov 2009-05-10 18:54:56 -05:00
parent 3254340cdb
commit c32927bfea
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/base64/base64-tests.factor
View File

@ -4,7 +4,7 @@ IN: base64.tests
[ "abcdefghijklmnopqrstuvwxyz" ] [ "abcdefghijklmnopqrstuvwxyz" ascii encode >base64 base64> ascii decode [ "abcdefghijklmnopqrstuvwxyz" ] [ "abcdefghijklmnopqrstuvwxyz" ascii encode >base64 base64> ascii decode
] unit-test ] 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 [ "a" ] [ "a" ascii encode >base64 base64> ascii decode ] unit-test
[ "ab" ] [ "ab" 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 [ "abc" ] [ "abc" ascii encode >base64 base64> ascii decode ] unit-test

4
basis/urls/encoding/encoding-tests.factor
View File

@ -2,8 +2,8 @@ IN: urls.encoding.tests
USING: urls.encoding tools.test arrays kernel assocs present accessors ; USING: urls.encoding tools.test arrays kernel assocs present accessors ;
[ "~hello world" ] [ "%7ehello world" url-decode ] unit-test [ "~hello world" ] [ "%7ehello world" url-decode ] unit-test
[ f ] [ "%XX%XX%XX" url-decode ] unit-test [ "" ] [ "%XX%XX%XX" url-decode ] unit-test
[ f ] [ "%XX%XX%X" url-decode ] unit-test [ "" ] [ "%XX%XX%X" url-decode ] unit-test
[ "hello world" ] [ "hello%20world" url-decode ] unit-test [ "hello world" ] [ "hello%20world" url-decode ] unit-test
[ " ! " ] [ "%20%21%20" url-decode ] unit-test [ " ! " ] [ "%20%21%20" url-decode ] unit-test

14
basis/urls/urls.factor
View File

@ -25,12 +25,14 @@ TUPLE: url protocol username password host port path query anchor ;
] if ; ] if ;
: parse-host ( string -- host port ) : parse-host ( string -- host port )
":" split1 [ url-decode ] [ [
dup [ ":" split1 [ url-decode ] [
string>number dup [
dup [ "Invalid port" throw ] unless string>number
] when dup [ "Invalid port" throw ] unless
] bi* ; ] when
] bi*
] [ f f ] if* ;
GENERIC: >url ( obj -- url ) GENERIC: >url ( obj -- url )