io: Really fix the tests.

diff --git a/basis/io/streams/throwing/throwing-tests.factor b/basis/io/streams/throwing/throwing-tests.factor
index d31b00f87cd3e80f151e68977a1a1d9af0eb609c..ff2efbe7e70c8afa47d05d385dc4d8780cc8c53f 100644 (file)
--- a/basis/io/streams/throwing/throwing-tests.factor
+++ b/basis/io/streams/throwing/throwing-tests.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2010 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: destructors io io.encodings.binary io.encodings.utf8
-io.files io.streams.byte-array io.streams.string
-io.streams.throwing kernel namespaces tools.test ;
+USING: arrays destructors io io.encodings.binary
+io.encodings.utf8 io.files io.streams.byte-array
+io.streams.string io.streams.throwing kernel namespaces
+sequences tools.test ;
 
 { "asdf" }
 [

diff --git a/extra/benchmark/regex-dna/regex-dna-tests.factor b/extra/benchmark/regex-dna/regex-dna-tests.factor
index b7ae5f776deba23b2ae5a69b0441c4c253deb8f2..cc9a1f43956e1bc301e9544c8f6b8577e1998304 100644 (file)
--- a/extra/benchmark/regex-dna/regex-dna-tests.factor
+++ b/extra/benchmark/regex-dna/regex-dna-tests.factor
@@ -1,5 +1,5 @@
-USING: benchmark.regex-dna io io.files io.encodings.ascii
-io.streams.string kernel tools.test splitting ;
+USING: benchmark.regex-dna io.encodings.ascii io.files
+io.streams.string kernel sequences tools.test ;
 
 { t } [
     "resource:extra/benchmark/regex-dna/regex-dna-test-in.txt"
@@ -7,5 +7,5 @@ io.streams.string kernel tools.test splitting ;
     "resource:extra/benchmark/regex-dna/regex-dna-test-out.txt"
     ! Ensure the line endings don't change on Windows
     ! when checking out with git.
-    ascii file-lines "\n" join =
+    ascii file-lines [ "\n" append ] map concat =
 ] unit-test