csv: fixing the tests for recent interface changes.

diff --git a/basis/csv/csv-tests.factor b/basis/csv/csv-tests.factor
index 020f7e19445d372c52e60936099822f3873ecb92..3c12b14f84650a1e34754c32f2075dba95e2f61c 100644 (file)
--- a/basis/csv/csv-tests.factor
+++ b/basis/csv/csv-tests.factor
@@ -9,73 +9,73 @@ IN: csv.tests
 
 "Fields are separated by commas"
 [ { { "1997" "Ford" "E350" } } ] 
-[ "1997,Ford,E350" <string-reader> csv ] named-unit-test
+[ "1997,Ford,E350" string>csv ] named-unit-test
 
 "ignores whitespace before and after elements. n.b.specifically prohibited by RFC 4180, which states, 'Spaces are considered part of a field and should not be ignored.'"
 [ { { "1997" "Ford" "E350" } } ]
-[ "1997,   Ford   , E350" <string-reader> csv ] named-unit-test
+[ "1997,   Ford   , E350" string>csv ] named-unit-test
 
 "keeps spaces in quotes"
 [ { { "1997" "Ford" "E350" "Super, luxurious truck" } } ]
-[ "1997,Ford,E350,\"Super, luxurious truck\"" <string-reader> csv ] named-unit-test
+[ "1997,Ford,E350,\"Super, luxurious truck\"" string>csv ] named-unit-test
 
 "double quotes mean escaped in quotes"
 [ { { "1997" "Ford" "E350" "Super \"luxurious\" truck" } } ]
 [ "1997,Ford,E350,\"Super \"\"luxurious\"\" truck\"" 
-  <string-reader> csv ] named-unit-test
+  string>csv ] named-unit-test
 
 "Fields with embedded line breaks must be delimited by double-quote characters."
 [ { { "1997" "Ford" "E350" "Go get one now\nthey are going fast" } } ]
 [ "1997,Ford,E350,\"Go get one now\nthey are going fast\""
-  <string-reader> csv ] named-unit-test
+  string>csv ] named-unit-test
 
 "Fields with leading or trailing spaces must be delimited by double-quote characters. (See comment about leading and trailing spaces above)"
 [ { { "1997" "Ford" "E350" "  Super luxurious truck    " } } ]
 [ "1997,Ford,E350,\"  Super luxurious truck    \""
-  <string-reader> csv ] named-unit-test
+  string>csv ] named-unit-test
 
 "Fields may always be delimited by double-quote characters, whether necessary or not."
 [ { { "1997" "Ford" "E350" } } ]
-[ "\"1997\",\"Ford\",\"E350\"" <string-reader> csv ] named-unit-test
+[ "\"1997\",\"Ford\",\"E350\"" string>csv ] named-unit-test
 
 "The first record in a csv file may contain column names in each of the fields."
 [ { { "Year" "Make" "Model" } 
     { "1997" "Ford" "E350" }
     { "2000" "Mercury" "Cougar" } } ]
 [ "Year,Make,Model\n1997,Ford,E350\n2000,Mercury,Cougar" 
-   <string-reader> csv ] named-unit-test
+   string>csv ] named-unit-test
 
 
 ! !!!!!!!!  other tests
 
-[ { { "Phil Dawes" } } ] 
-[ "\"Phil Dawes\"" <string-reader> csv ] unit-test
+[ { { "Phil Dawes" } } ]
+[ "\"Phil Dawes\"" string>csv ] unit-test
 
-[ { { "1" "2" "3" } { "4" "5" "6" } } ] 
-[ "1,2,3\n4,5,6\n" <string-reader> csv ] unit-test
+[ { { "1" "2" "3" } { "4" "5" "6" } } ]
+[ "1,2,3\n4,5,6\n" string>csv ] unit-test
 
 "trims leading and trailing whitespace - n.b. this isn't really conformant, but lots of csv seems to assume this"
-[ { { "foo yeah" "bah" "baz" } } ] 
-[ "  foo yeah  , bah ,baz\n" <string-reader> csv ] named-unit-test
+[ { { "foo yeah" "bah" "baz" } } ]
+[ "  foo yeah  , bah ,baz\n" string>csv ] named-unit-test
 
 
 "allows setting of delimiting character"
-[ { { "foo" "bah" "baz" } } ] 
-[ "foo\tbah\tbaz\n" <string-reader> CHAR: \t [ csv ] with-delimiter ] named-unit-test
+[ { { "foo" "bah" "baz" } } ]
+[ "foo\tbah\tbaz\n" CHAR: \t [ string>csv ] with-delimiter ] named-unit-test
 
 "Quoted field followed immediately by newline"
 [ { { "foo" "bar" }
     { "1"   "2" } } ]
-[ "foo,\"bar\"\n1,2" <string-reader> csv ] named-unit-test
+[ "foo,\"bar\"\n1,2" string>csv ] named-unit-test
 
 "can write csv too!"
 [ "foo1,bar1\nfoo2,bar2\n" ]
-[ { { "foo1" "bar1" } { "foo2" "bar2" } } <string-writer> [ write-csv ] keep >string ] named-unit-test
+[ { { "foo1" "bar1" } { "foo2" "bar2" } } csv>string ] named-unit-test
 
 
 "escapes quotes commas and newlines when writing"
 [ "\"fo\"\"o1\",bar1\n\"fo\no2\",\"b,ar2\"\n" ]
-[ { { "fo\"o1" "bar1" } { "fo\no2" "b,ar2" } } <string-writer> [ write-csv ] keep >string ] named-unit-test ! "
+[ { { "fo\"o1" "bar1" } { "fo\no2" "b,ar2" } } csv>string ] named-unit-test ! "
 
 [ { { "writing" "some" "csv" "tests" } } ]
 [
@@ -89,7 +89,8 @@ IN: csv.tests
     unique-file utf8 [ csv>file ] [ file>csv ] 2bi =
 ] unit-test
 
-[ { { "hello" "" "" "" "goodbye" "" } } ] [ "hello,,\"\",,goodbye," <string-reader> csv ] unit-test
+[ { { "hello" "" "" "" "goodbye" "" } } ]
+[ "hello,,\"\",,goodbye," string>csv ] unit-test
 
 { { { "asd\"f\"" "asdf" } } } [ "asd\"f\",asdf" string>csv ] unit-test
 { { { "a\"sdf" "asdf" } } } [ "a\"sdf,asdf" string>csv ] unit-test