basis: Cleaning up tests using lists and IN: forms.

diff --git a/basis/alien/c-types/c-types-tests.factor b/basis/alien/c-types/c-types-tests.factor
index 63edbdff50b516f30cb9bb9712ec87b07f42f43f..09a31fa73c67ecc3b46fa19e020e87c9c252c5ac 100644 (file)
--- a/basis/alien/c-types/c-types-tests.factor
+++ b/basis/alien/c-types/c-types-tests.factor
@@ -1,7 +1,6 @@
-USING: alien alien.syntax alien.c-types alien.parser
-eval kernel tools.test sequences system libc alien.strings
-io.encodings.ascii io.encodings.utf8 math.constants classes.struct classes
-accessors compiler.units ;
+USING: accessors alien.c-types alien.syntax classes
+classes.struct compiler.units eval io.encodings.ascii kernel
+math.constants tools.test ;
 FROM: alien.c-types => short ;
 IN: alien.c-types.tests
 

diff --git a/basis/alien/complex/complex-tests.factor b/basis/alien/complex/complex-tests.factor
index aa549659d07432d871a616691ba6d857ba3bba8d..564f97cd385c18247f373d22465a4799a10ffc66 100644 (file)
--- a/basis/alien/complex/complex-tests.factor
+++ b/basis/alien/complex/complex-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors tools.test alien.complex classes.struct kernel
-alien.c-types alien.syntax namespaces math ;
+USING: accessors alien.c-types alien.complex classes.struct math
+namespaces tools.test ;
 IN: alien.complex.tests
 
 STRUCT: complex-holder

diff --git a/basis/alien/data/data-tests.factor b/basis/alien/data/data-tests.factor
index 1a6daa523d18869cd89eda7c025a88da04d06001..9806d90fc87c0d43a245d4fa644f3a37dd3aea6b 100644 (file)
--- a/basis/alien/data/data-tests.factor
+++ b/basis/alien/data/data-tests.factor
@@ -1,7 +1,6 @@
-USING: alien alien.data alien.syntax
-classes.struct kernel sequences specialized-arrays
-specialized-arrays.private tools.test compiler.units vocabs
-system ;
+USING: alien alien.data alien.syntax classes.struct
+compiler.units kernel sequences specialized-arrays
+specialized-arrays.private system tools.test vocabs ;
 QUALIFIED-WITH: alien.c-types c
 IN: alien.data.tests
 

diff --git a/basis/alien/endian/endian-tests.factor b/basis/alien/endian/endian-tests.factor
index 5134b3cc864a50ab33ea71d48545d343c67736d1..8f7484be4c8a71d3479f5e03ceae5f91cc4f9ce9 100644 (file)
--- a/basis/alien/endian/endian-tests.factor
+++ b/basis/alien/endian/endian-tests.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.endian classes.struct io
-io.encodings.binary io.streams.byte-array kernel tools.test
-alien.c-types ;
+USING: accessors alien.c-types alien.endian classes.struct io
+io.encodings.binary io.streams.byte-array kernel tools.test ;
 IN: alien.endian.tests
 
 STRUCT: endian-struct

diff --git a/basis/alien/libraries/libraries-tests.factor b/basis/alien/libraries/libraries-tests.factor
index 40f677a51cb5227a4fa65be2fc06ae476c1001fa..46b8ce6699d3ac34a31868c5097a229b42d8f23d 100755 (executable)
--- a/basis/alien/libraries/libraries-tests.factor
+++ b/basis/alien/libraries/libraries-tests.factor
@@ -1,5 +1,4 @@
-USING: alien alien.libraries alien.syntax tools.test kernel ;
-IN: alien.libraries.tests
+USING: alien alien.libraries alien.syntax kernel tools.test ;
 
 { f } [ DLL" fadfasdfsada" dll-valid? ] unit-test
 

diff --git a/basis/alien/prettyprint/prettyprint-tests.factor b/basis/alien/prettyprint/prettyprint-tests.factor
index 1b0d05d3857056504a1fe90f69404ab48382db4a..7c1ac65f3c2f82b17bcdef5c2ce1ff50257ec51a 100644 (file)
--- a/basis/alien/prettyprint/prettyprint-tests.factor
+++ b/basis/alien/prettyprint/prettyprint-tests.factor
@@ -1,6 +1,5 @@
-USING: alien.c-types alien.prettyprint alien.syntax
-io.streams.string see tools.test prettyprint
-io.encodings.ascii ;
+USING: alien.c-types alien.syntax io.encodings.ascii
+io.streams.string prettyprint see tools.test ;
 IN: alien.prettyprint.tests
 
 CONSTANT: FOO 10

diff --git a/basis/alien/remote-control/remote-control-tests.factor b/basis/alien/remote-control/remote-control-tests.factor
index e8d132f6db24c2e6eac5838c757278fb0cc4928b..c1655665ef13a83dc48f3457f58ea551cea8f2c1 100644 (file)
--- a/basis/alien/remote-control/remote-control-tests.factor
+++ b/basis/alien/remote-control/remote-control-tests.factor
@@ -1,7 +1,5 @@
-USING: interpolate multiline
-io io.directories io.encodings.ascii io.files
-io.files.temp io.launcher io.streams.string kernel locals system
-tools.test sequences ;
+USING: interpolate io io.encodings.ascii io.files io.files.temp
+io.launcher io.streams.string kernel locals sequences system ;
 IN: alien.remote-control.tests
 
 : compile-file ( contents -- )

diff --git a/basis/ascii/ascii-tests.factor b/basis/ascii/ascii-tests.factor
index 858b10117d7163b744f5df552b70f0dae38cd5bf..f5a141f34d1607033aa24032cf1e298063e13dc4 100644 (file)
--- a/basis/ascii/ascii-tests.factor
+++ b/basis/ascii/ascii-tests.factor
@@ -1,5 +1,4 @@
-USING: ascii tools.test sequences kernel math strings ;
-IN: ascii.tests
+USING: ascii kernel math sequences strings tools.test ;
 
 { t } [ CHAR: a letter? ] unit-test
 { f } [ CHAR: A letter? ] unit-test

diff --git a/basis/base64/base64-tests.factor b/basis/base64/base64-tests.factor
index 23daf0083eafa5c0fca48531119140143197d3dd..4e7e887ceb578de6f72b0e2b0b9d10a854eb8c71 100644 (file)
--- a/basis/base64/base64-tests.factor
+++ b/basis/base64/base64-tests.factor
@@ -1,6 +1,5 @@
-USING: kernel tools.test base64 strings sequences
-io.encodings.string io.encodings.ascii ;
-IN: base64.tests
+USING: base64 io.encodings.ascii io.encodings.string kernel
+sequences strings tools.test ;
 
 { "abcdefghijklmnopqrstuvwxyz" } [ "abcdefghijklmnopqrstuvwxyz" ascii encode >base64 base64> ascii decode
 ] unit-test

diff --git a/basis/biassocs/biassocs-tests.factor b/basis/biassocs/biassocs-tests.factor
index 48f78800a1299767ff0b5062b5fa969d942abb99..8836c3995c1580799f9ea22a987df6eae6f912db 100644 (file)
--- a/basis/biassocs/biassocs-tests.factor
+++ b/basis/biassocs/biassocs-tests.factor
@@ -1,5 +1,4 @@
-USING: biassocs assocs namespaces tools.test hashtables kernel ;
-IN: biassocs.tests
+USING: assocs biassocs hashtables kernel namespaces tools.test ;
 
 <bihash> "h" set
 

diff --git a/basis/binary-search/binary-search-tests.factor b/basis/binary-search/binary-search-tests.factor
index 7a15852fca0fa8a40c4f94f9cea5aebc90984932..b36c5f03822f0ffc0a009f2312c74874c755f9d2 100644 (file)
--- a/basis/binary-search/binary-search-tests.factor
+++ b/basis/binary-search/binary-search-tests.factor
@@ -1,5 +1,4 @@
-USING: binary-search math.order sequences kernel tools.test ;
-IN: binary-search.tests
+USING: binary-search kernel math.order sequences tools.test ;
 
 { f } [ 3 { } [ <=> ] with search drop ] unit-test
 { 0 } [ 3 { 3 } [ <=> ] with search drop ] unit-test

diff --git a/basis/bit-arrays/bit-arrays-tests.factor b/basis/bit-arrays/bit-arrays-tests.factor
index 4588dbae0316d6201a1a61955f4289ebc7456ee3..b8ec3f7811317a91e57d757e93d6e4b66ae613f4 100644 (file)
--- a/basis/bit-arrays/bit-arrays-tests.factor
+++ b/basis/bit-arrays/bit-arrays-tests.factor
@@ -1,6 +1,5 @@
-USING: alien sequences sequences.private arrays bit-arrays kernel
-tools.test math random ;
-IN: bit-arrays.tests
+USING: alien arrays bit-arrays kernel math random sequences
+sequences.private tools.test ;
 
 [ -1 <bit-array> ] [ T{ bad-array-length f -1 } = ] must-fail-with
 

diff --git a/basis/bit-sets/bit-sets-tests.factor b/basis/bit-sets/bit-sets-tests.factor
index 74c3ebb611cec81e83dcb71a807465f480a48a69..f04dce424bbf9a06db73f8c43f0f667d56b64565 100644 (file)
--- a/basis/bit-sets/bit-sets-tests.factor
+++ b/basis/bit-sets/bit-sets-tests.factor
@@ -1,5 +1,4 @@
-USING: bit-sets tools.test sets kernel bit-arrays ;
-IN: bit-sets.tests
+USING: bit-arrays bit-sets kernel sets tools.test ;
 
 { T{ bit-set f ?{ t f t f t f } } } [
     T{ bit-set f ?{ t f f f t f } }

diff --git a/basis/bit-vectors/bit-vectors-tests.factor b/basis/bit-vectors/bit-vectors-tests.factor
index 9b72f605afb1893bab57405cbb2399975d2ce47f..3a969b4cdecfabd93e47cefd7e94a3ef0df64b01 100644 (file)
--- a/basis/bit-vectors/bit-vectors-tests.factor
+++ b/basis/bit-vectors/bit-vectors-tests.factor
@@ -1,4 +1,4 @@
-USING: tools.test bit-vectors vectors sequences kernel math ;
+USING: bit-vectors kernel math sequences tools.test vectors ;
 IN: bit-vectors.tests
 
 { 0 } [ 123 <bit-vector> length ] unit-test

diff --git a/basis/bitstreams/bitstreams-tests.factor b/basis/bitstreams/bitstreams-tests.factor
index 9f1f471911dad3d96cd43de09498dd86cbc64418..f83d6eb20de226298c84ea52875fdafecd570848 100644 (file)
--- a/basis/bitstreams/bitstreams-tests.factor
+++ b/basis/bitstreams/bitstreams-tests.factor
@@ -1,9 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors bitstreams io io.streams.string kernel tools.test
-grouping compression.lzw multiline byte-arrays io.encodings.binary
-io.streams.byte-array ;
-IN: bitstreams.tests
+USING: accessors bitstreams kernel tools.test ;
 
 { 0b1111111111 }
 [

diff --git a/basis/boxes/boxes-tests.factor b/basis/boxes/boxes-tests.factor
index cf3505bd78710ac857bae5cbfd8da39b9bd98754..11b8196f341355953ec6efd921e66a2498641d30 100644 (file)
--- a/basis/boxes/boxes-tests.factor
+++ b/basis/boxes/boxes-tests.factor
@@ -1,5 +1,4 @@
-USING: boxes namespaces tools.test accessors ;
-IN: boxes.tests
+USING: accessors boxes namespaces tools.test ;
 
 { } [ <box> "b" set ] unit-test
 

diff --git a/basis/byte-arrays/hex/hex-tests.factor b/basis/byte-arrays/hex/hex-tests.factor
index 814bae4be7f9516f2aebadd3099faae8ff726621..ad78111fea2e23c8a9fc654b81025a3cf1b785b9 100644 (file)
--- a/basis/byte-arrays/hex/hex-tests.factor
+++ b/basis/byte-arrays/hex/hex-tests.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test byte-arrays.hex eval ;
-IN: byte-arrays.hex.tests
+USING: byte-arrays.hex eval tools.test ;
 
 { B{ 16 0 8 0 } } [ HEX{ 10 00 08 00 } ] unit-test
 { B{ 255 255 15 255 255 255 } } [ HEX{ ffff 0fff ffff } ] unit-test

diff --git a/basis/cache/cache-tests.factor b/basis/cache/cache-tests.factor
index fd932a8292971c4f9be4b7fcc48fe2f120f6499b..1726dbcd8cb77a8d143920e4cc3285ecba6cb8ca 100755 (executable)
--- a/basis/cache/cache-tests.factor
+++ b/basis/cache/cache-tests.factor
@@ -1,5 +1,5 @@
-USING: cache tools.test accessors destructors kernel assocs
-namespaces ;
+USING: accessors assocs cache destructors kernel namespaces
+tools.test ;
 IN: cache.tests
 
 TUPLE: mock-disposable < disposable n ;

diff --git a/basis/cairo/cairo-tests.factor b/basis/cairo/cairo-tests.factor
index 66307e65c3900eb7a59ea800001d7a60f3412589..0d3731d76b81b0cdd1d6016f53c69158409f8481 100644 (file)
--- a/basis/cairo/cairo-tests.factor
+++ b/basis/cairo/cairo-tests.factor
@@ -1,5 +1,4 @@
-USING: cairo tools.test math.rectangles accessors ;
-IN: cairo.tests
+USING: accessors cairo math.rectangles tools.test ;
 
 { { 10 20 } } [
     { 10 20 } [

diff --git a/basis/calendar/calendar-tests.factor b/basis/calendar/calendar-tests.factor
index e1cc2bcdb73ed09bdd1513e8708dcbc731f063b7..67f12422c2620ac02103d1a8995205e088ca123f 100644 (file)
--- a/basis/calendar/calendar-tests.factor
+++ b/basis/calendar/calendar-tests.factor
@@ -1,7 +1,5 @@
-USING: arrays calendar kernel math sequences tools.test
-continuations system math.order threads accessors
-random ;
-IN: calendar.tests
+USING: accessors kernel math.order random threads tools.test ;
+IN: calendar
 
 { f } [ 2004 12 32 0   0  0 instant <timestamp> valid-timestamp? ] unit-test
 { f } [ 2004  2 30 0   0  0 instant <timestamp> valid-timestamp? ] unit-test

diff --git a/basis/calendar/format/format-tests.factor b/basis/calendar/format/format-tests.factor
index 64f030e84ff55fb53d630ce7d28fd05cb4cb2a53..e5ae43c90f595a98d2fe44b16d841f45b3ed05af 100644 (file)
--- a/basis/calendar/format/format-tests.factor
+++ b/basis/calendar/format/format-tests.factor
@@ -1,6 +1,5 @@
-USING: calendar.format calendar kernel math tools.test
-io.streams.string accessors io math.order sequences ;
-IN: calendar.format.tests
+USING: accessors calendar calendar.format io io.streams.string
+kernel math.order sequences tools.test ;
 
 { 0 } [
     "Z" [ read1 read-rfc3339-gmt-offset ] with-string-reader duration>hours

diff --git a/basis/channels/channels-tests.factor b/basis/channels/channels-tests.factor
index df78dcdcfa2a442e4bfab0541d5713fc293f4ff0..901de435fbf65f0237939c8d3a33750ee2f0065c 100644 (file)
--- a/basis/channels/channels-tests.factor
+++ b/basis/channels/channels-tests.factor
@@ -1,9 +1,6 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
-!
-USING: kernel tools.test math channels channels.private
-sequences threads sorting ;
-IN: channels.tests
+USING: channels kernel sequences sorting threads tools.test ;
 
 { V{ 10 } } [
     V{ } clone <channel>

diff --git a/basis/channels/remote/remote-tests.factor b/basis/channels/remote/remote-tests.factor
index 01dba8a4c125f02d33ed1827e99d091d81424557..b886e83c5862060574cc0d4f0c17a0457f8fabd6 100644 (file)
--- a/basis/channels/remote/remote-tests.factor
+++ b/basis/channels/remote/remote-tests.factor
@@ -1,9 +1,7 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
-!
-USING: kernel tools.test math assocs channels channels.remote
-channels.remote.private ;
-IN: channels.remote.tests
+USING: assocs channels channels.remote channels.remote.private
+kernel tools.test ;
 
 { t } [
     remote-channels assoc?

diff --git a/basis/checksums/adler-32/adler-32-tests.factor b/basis/checksums/adler-32/adler-32-tests.factor
index f72a302d80e0d4facc2eaa5c589c8963199e4776..0b300d5ed13960d0b5144aaba8f97e505866387d 100644 (file)
--- a/basis/checksums/adler-32/adler-32-tests.factor
+++ b/basis/checksums/adler-32/adler-32-tests.factor
@@ -1,5 +1,4 @@
-USING: checksums.adler-32 checksums strings tools.test ;
-IN: checksums.adler-32.tests
+USING: checksums checksums.adler-32 strings tools.test ;
 
 { 300286872 } [ "Wikipedia" adler-32 checksum-bytes ] unit-test
 { 2679885283 } [ 10000 CHAR: a <string> adler-32 checksum-bytes ] unit-test

diff --git a/basis/checksums/bsd/bsd-tests.factor b/basis/checksums/bsd/bsd-tests.factor
index 0e430880da235ed282b4357280fdf6372d5024d2..9a61483b8e621fb116939191739d9b17cc41eeb3 100644 (file)
--- a/basis/checksums/bsd/bsd-tests.factor
+++ b/basis/checksums/bsd/bsd-tests.factor
@@ -1,5 +1,4 @@
-USING: checksums.bsd checksums strings tools.test ;
-IN: checksums.bsd
+USING: checksums checksums.bsd strings tools.test ;
 
 { 15816 } [ "Wikipedia" bsd checksum-bytes ] unit-test
 { 47937 } [ 10000 CHAR: a <string> bsd checksum-bytes ] unit-test

diff --git a/basis/checksums/fletcher/fletcher-tests.factor b/basis/checksums/fletcher/fletcher-tests.factor
index 1b04eb06023ae297db7a3fc0f190fd001d5444e8..f146e9460d918d985f48368e1f9dbbfa5d68b6e1 100644 (file)
--- a/basis/checksums/fletcher/fletcher-tests.factor
+++ b/basis/checksums/fletcher/fletcher-tests.factor
@@ -1,5 +1,4 @@
-USING: checksums kernel sequences tools.test ;
-IN: checksums.fletcher
+USING: checksums checksums.fletcher kernel sequences tools.test ;
 
 {
     { 51440 3948201259 14034561336514601929 }

diff --git a/basis/checksums/fnv1/fnv1-tests.factor b/basis/checksums/fnv1/fnv1-tests.factor
index b54a28960996ee22f742df699a69ebf72a9c0532..6b6d97c5a243c672b9bc93238cb09d6fac6fe2e2 100644 (file)
--- a/basis/checksums/fnv1/fnv1-tests.factor
+++ b/basis/checksums/fnv1/fnv1-tests.factor
@@ -1,5 +1,4 @@
-USING: checksums.fnv1 checksums strings tools.test ;
-IN: checksums.fnv1.tests
+USING: checksums checksums.fnv1 tools.test ;
 
 ! A few test vectors taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c
 

diff --git a/basis/checksums/hmac/hmac-tests.factor b/basis/checksums/hmac/hmac-tests.factor
index 7a18fbb7315237f424d565bc7ea0280d8c006008..092c866f0a019d5b802366cc5a273734aff475eb 100644 (file)
--- a/basis/checksums/hmac/hmac-tests.factor
+++ b/basis/checksums/hmac/hmac-tests.factor
@@ -1,7 +1,5 @@
-USING: kernel io strings byte-arrays sequences namespaces math
-math.parser parser checksums.hmac tools.test checksums.md5
-checksums.sha checksums ;
-IN: checksums.hmac.tests
+USING: checksums.hmac checksums.md5 checksums.sha math.parser
+sequences strings tools.test ;
 
 {
     "\u000092\u000094rz68\u0000bb\u00001c\u000013\u0000f4\u00008e\u0000f8\u000015\u00008b\u0000fc\u00009d"

diff --git a/basis/checksums/interleave/interleave-tests.factor b/basis/checksums/interleave/interleave-tests.factor
index 7ca9ab029830ac0d18a10933a5a64ca81f477ca3..8c1f50d2f5e11836113bd572f06b06ffe0decfc5 100644 (file)
--- a/basis/checksums/interleave/interleave-tests.factor
+++ b/basis/checksums/interleave/interleave-tests.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test checksums.interleave checksums.sha ;
-IN: checksums.interleave.tests
+USING: checksums.interleave checksums.sha tools.test ;
 
 {
     B{

diff --git a/basis/checksums/internet/internet-tests.factor b/basis/checksums/internet/internet-tests.factor
index fa7fe9b8763977062c3421eb3f62675e738e3d69..11334905b0ce935df3c99a790ae74ac9da3e1883 100644 (file)
--- a/basis/checksums/internet/internet-tests.factor
+++ b/basis/checksums/internet/internet-tests.factor
@@ -1,9 +1,7 @@
 ! Copyright (C) 2010 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-
 USING: checksums checksums.internet tools.test ;
-
-IN: checksums
+IN: checksums.internet.tests
 
 { B{ 255 255 } } [ { } internet checksum-bytes ] unit-test
 { B{ 254 255 } } [ { 1 } internet checksum-bytes ] unit-test

diff --git a/basis/checksums/md5/md5-tests.factor b/basis/checksums/md5/md5-tests.factor
index 413f2280c5773565a8099ea3d669b9799c1ae830..04905db7379050a782dd2493ae4c8789dec40ea9 100644 (file)
--- a/basis/checksums/md5/md5-tests.factor
+++ b/basis/checksums/md5/md5-tests.factor
@@ -1,9 +1,7 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: byte-arrays checksums checksums.md5 io.encodings.binary
-io.streams.byte-array kernel math math.parser namespaces
-tools.test sequences ;
-IN: checksums.md5.tests
+io.streams.byte-array kernel math.parser sequences tools.test ;
 
 { "d41d8cd98f00b204e9800998ecf8427e" } [ "" >byte-array md5 checksum-bytes bytes>hex-string ] unit-test
 { "0cc175b9c0f1b6a831c399e269772661" } [ "a" >byte-array md5 checksum-bytes bytes>hex-string ] unit-test

diff --git a/basis/checksums/murmur/murmur-tests.factor b/basis/checksums/murmur/murmur-tests.factor
index 8a16c5a90552e07181a30eb3cfb29f69c8973891..3e0cf072ee730388b9d233dfe1e0df38ed7e6c53 100644 (file)
--- a/basis/checksums/murmur/murmur-tests.factor
+++ b/basis/checksums/murmur/murmur-tests.factor
@@ -1,6 +1,5 @@
-USING: byte-arrays checksums fry kernel math sequences
-tools.test ;
-IN: checksums.murmur
+USING: byte-arrays checksums checksums.murmur fry kernel math
+sequences tools.test ;
 
 { 455139366 } [ "asdf" >byte-array 0 <murmur3-32> checksum-bytes ] unit-test
 { 417250299 } [ "asdf" >byte-array 156 <murmur3-32> checksum-bytes ] unit-test

diff --git a/basis/checksums/openssl/openssl-tests.factor b/basis/checksums/openssl/openssl-tests.factor
index a751728fc6b6fd32ce29c2b3215a45b9436e9480..703cfbb6e96bbd4360d02b14f2cf1da74a26165e 100644 (file)
--- a/basis/checksums/openssl/openssl-tests.factor
+++ b/basis/checksums/openssl/openssl-tests.factor
@@ -1,6 +1,5 @@
 USING: accessors byte-arrays checksums checksums.openssl
 combinators.short-circuit kernel system tools.test ;
-IN: checksums.openssl.tests
 
 {
     B{ 201 238 222 100 92 200 182 188 138 255 129 163 115 88 240 136 }

diff --git a/basis/checksums/sha/sha-tests.factor b/basis/checksums/sha/sha-tests.factor
index 081c6d1b2bec729c8099910770afa58cd5ad3540..58190ef4a2f0786d605af859199882e2cf2aa9c6 100644 (file)
--- a/basis/checksums/sha/sha-tests.factor
+++ b/basis/checksums/sha/sha-tests.factor
@@ -1,6 +1,6 @@
 USING: arrays checksums checksums.sha checksums.sha.private
-io.encodings.binary io.streams.byte-array kernel math
-math.parser namespaces sequences tools.test ;
+io.encodings.binary io.streams.byte-array kernel math.parser
+sequences tools.test ;
 IN: checksums.sha.tests
 
 : test-checksum ( text identifier -- checksum )

diff --git a/basis/checksums/superfast/superfast-tests.factor b/basis/checksums/superfast/superfast-tests.factor
index 54b9bbc52082cbff958efbdceafaf90c1a412bb0..499b550367725ba2cddd70758215c7b084029d8c 100644 (file)
--- a/basis/checksums/superfast/superfast-tests.factor
+++ b/basis/checksums/superfast/superfast-tests.factor
@@ -1,6 +1,5 @@
-USING: byte-arrays checksums fry kernel math sequences
-tools.test ;
-IN: checksums.superfast
+USING: byte-arrays checksums checksums.superfast fry kernel math
+sequences tools.test ;
 
 {
     {

diff --git a/basis/checksums/xxhash/xxhash-tests.factor b/basis/checksums/xxhash/xxhash-tests.factor
index 052807b0aec5b2ea4ee626154ed905a97a39fa09..bdedd354527f457673549c9da6d11c508741efae 100644 (file)
--- a/basis/checksums/xxhash/xxhash-tests.factor
+++ b/basis/checksums/xxhash/xxhash-tests.factor
@@ -1,5 +1,4 @@
-USING: byte-arrays checksums tools.test ;
-IN: checksums.xxhash
+USING: byte-arrays checksums checksums.xxhash tools.test ;
 
 { 1584409650 } [ "asdf" 0 <xxhash> checksum-bytes ] unit-test
 { 4257502458 } [ "Hello World!" 12345 <xxhash> checksum-bytes ] unit-test

diff --git a/basis/classes/struct/bit-accessors/bit-accessors-tests.factor b/basis/classes/struct/bit-accessors/bit-accessors-tests.factor
index 8af8e768066628a1c8669e55c59de11c34c33aed..5df3adf2710f185627206281ceca2b601583cb8f 100644 (file)
--- a/basis/classes/struct/bit-accessors/bit-accessors-tests.factor
+++ b/basis/classes/struct/bit-accessors/bit-accessors-tests.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: classes.struct.bit-accessors tools.test effects kernel
-sequences random stack-checker ;
-IN: classes.struct.bit-accessors.test
+USING: classes.struct.bit-accessors effects random stack-checker
+tools.test ;
 
 { t } [ 20 random 20 random bit-reader infer ( alien -- n ) effect= ] unit-test
 { t } [ 20 random 20 random bit-writer infer ( n alien -- ) effect= ] unit-test

diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor
index 69ef873098066c78fc068ee66d4d8a4fff644fb7..26c3aa6602d74dead65284055ec8a3c4714d855c 100644 (file)
--- a/basis/classes/struct/struct-tests.factor
+++ b/basis/classes/struct/struct-tests.factor
@@ -1,14 +1,14 @@
 ! (c)Joe Groff bsd license
 USING: accessors alien alien.c-types alien.data alien.syntax
-ascii assocs byte-arrays classes.struct
-classes.struct.prettyprint classes.struct.prettyprint.private
-classes.tuple.parser classes.tuple.private classes.tuple
-combinators compiler.tree.debugger compiler.units delegate
-destructors io.encodings.utf8 io.pathnames io.streams.string
-kernel libc literals math mirrors namespaces prettyprint
-prettyprint.config see sequences specialized-arrays system
-tools.test parser lexer eval layouts generic.single classes
-vocabs generic classes.private definitions specialized-arrays.private ;
+assocs byte-arrays classes classes.private classes.struct
+classes.struct.prettyprint.private classes.tuple
+classes.tuple.parser classes.tuple.private combinators
+compiler.tree.debugger compiler.units definitions delegate
+destructors eval generic generic.single io.encodings.utf8
+io.streams.string kernel layouts lexer libc literals math
+mirrors namespaces parser prettyprint prettyprint.config see
+sequences specialized-arrays specialized-arrays.private
+system tools.test vocabs ;
 FROM: math => float ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAY: char

diff --git a/basis/cocoa/cocoa-tests.factor b/basis/cocoa/cocoa-tests.factor
index 466823a5a89b3fd2d8fbc40ec42ab55e1aba1e58..454af95e4189a7a12e6dbbdaf07f249f3b071313 100644 (file)
--- a/basis/cocoa/cocoa-tests.factor
+++ b/basis/cocoa/cocoa-tests.factor
@@ -1,7 +1,6 @@
-USING: alien.c-types cocoa cocoa.messages cocoa.subclassing
-cocoa.types compiler.test kernel namespaces cocoa.classes
-cocoa.runtime tools.test memory compiler.units math
-core-graphics.types ;
+USING: alien.c-types cocoa cocoa.classes cocoa.subclassing
+cocoa.types compiler.test core-graphics.types kernel math memory
+namespaces tools.test ;
 IN: cocoa.tests
 
 CLASS: Foo < NSObject

diff --git a/basis/colors/constants/constants-tests.factor b/basis/colors/constants/constants-tests.factor
index d13d04caa0581e082d1718e2b6b4a86ac78a8654..4c453df53c8ec09ae080f037091864b8353b350a 100644 (file)
--- a/basis/colors/constants/constants-tests.factor
+++ b/basis/colors/constants/constants-tests.factor
@@ -1,6 +1,5 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test colors.constants colors ;
-IN: colors.constants.tests
+USING: colors colors.constants tools.test ;
 
 { t } [ COLOR: light-green rgba? ] unit-test

diff --git a/basis/colors/hex/hex-tests.factor b/basis/colors/hex/hex-tests.factor
index 1dcd53c4346a79facade8315dcbc211d0fc7194c..94df043e3dd0aaca3f46508d99db6bbfbfffa97f 100644 (file)
--- a/basis/colors/hex/hex-tests.factor
+++ b/basis/colors/hex/hex-tests.factor
@@ -1,10 +1,7 @@
 ! Copyright (C) 2010 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-
 USING: colors colors.hex tools.test ;
 
-IN: colors.hex.test
-
 { HEXCOLOR: 000000 } [ 0.0 0.0 0.0 1.0 <rgba> ] unit-test
 { HEXCOLOR: FFFFFF } [ 1.0 1.0 1.0 1.0 <rgba> ] unit-test
 { HEXCOLOR: abcdef } [ "abcdef" hex>rgba ] unit-test

diff --git a/basis/colors/hsv/hsv-tests.factor b/basis/colors/hsv/hsv-tests.factor
index 3f6a4e75b498f4989e083ab87651f5eee079ea87..bc5853cd0beb1d6a4c1e71a247dfd872fc8c22dd 100644 (file)
--- a/basis/colors/hsv/hsv-tests.factor
+++ b/basis/colors/hsv/hsv-tests.factor
@@ -1,4 +1,4 @@
-USING: accessors kernel colors colors.hsv tools.test math ;
+USING: accessors colors colors.hsv kernel math tools.test ;
 IN: colors.hsv.tests
 
 : hsv>rgb ( h s v -- r g b )

diff --git a/basis/colors/mix/mix-tests.factor b/basis/colors/mix/mix-tests.factor
index 536f8ae568134fa0dc483e0cba4000ff790c9d47..ccddab02dd2746d78b82999da95200d4db06d110 100644 (file)
--- a/basis/colors/mix/mix-tests.factor
+++ b/basis/colors/mix/mix-tests.factor
@@ -1,5 +1,4 @@
-USING: colors.constants kernel tools.test ;
-IN: colors.mix
+USING: colors.constants colors.mix kernel tools.test ;
 
 { COLOR: blue } [ COLOR: blue COLOR: red 0.0 linear-gradient ] unit-test
 { COLOR: red } [ COLOR: blue COLOR: red 1.0 linear-gradient ] unit-test

diff --git a/basis/columns/columns-tests.factor b/basis/columns/columns-tests.factor
index 1a9b65c7d1e4f05e40ac4464b6d335ebf5a8b015..4bd8af976eb00e67e522a50587055c6584ef2c5d 100644 (file)
--- a/basis/columns/columns-tests.factor
+++ b/basis/columns/columns-tests.factor
@@ -1,5 +1,5 @@
-USING: columns sequences kernel namespaces arrays tools.test math ;
-IN: columns.tests
+USING: arrays columns kernel math namespaces sequences
+tools.test ;
 
 ! Columns
 { { 1 2 3 } { 4 5 6 } { 7 8 9 } } [ clone ] map "seq" set

diff --git a/basis/combinators/random/random-tests.factor b/basis/combinators/random/random-tests.factor
index 46282a3222a2f7d9494b7bb75fba0146e4f30a7b..df969a602764200cf8630ee3f5a17823e1207f84 100644 (file)
--- a/basis/combinators/random/random-tests.factor
+++ b/basis/combinators/random/random-tests.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2010 Jon Harper.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test combinators.random combinators.random.private ;
-IN: combinators.random.tests
+USING: combinators.random combinators.random.private tools.test ;
 
 { 1 } [ 1 [ 1 ] [ 2 ] ifp ] unit-test
 { 2 } [ 0 [ 1 ] [ 2 ] ifp ] unit-test

diff --git a/basis/combinators/short-circuit/short-circuit-tests.factor b/basis/combinators/short-circuit/short-circuit-tests.factor
index b857a5043693324acd96f8c941a588625fadf5bf..ae4fdd8a8a40bdf7f2425982715d762e1e86f973 100644 (file)
--- a/basis/combinators/short-circuit/short-circuit-tests.factor
+++ b/basis/combinators/short-circuit/short-circuit-tests.factor
@@ -1,4 +1,5 @@
-USING: kernel math tools.test combinators.short-circuit accessors ;
+USING: accessors combinators.short-circuit kernel math
+tools.test ;
 IN: combinators.short-circuit.tests
 
 { 3 } [ { [ 1 ] [ 2 ] [ 3 ] } 0&& ] unit-test

diff --git a/basis/combinators/short-circuit/smart/smart-tests.factor b/basis/combinators/short-circuit/smart/smart-tests.factor
index 268b8120a0ac873ec95e87536bc07810aa1a1509..3bde35f6674553602d1f21d16ab143e817532616 100644 (file)
--- a/basis/combinators/short-circuit/smart/smart-tests.factor
+++ b/basis/combinators/short-circuit/smart/smart-tests.factor
@@ -1,5 +1,4 @@
-USING: kernel math tools.test combinators.short-circuit.smart ;
-IN: combinators.short-circuit.smart.tests
+USING: combinators.short-circuit.smart kernel math tools.test ;
 
 { t } [       { [ 1 ] [ 2 ] [ 3 ] }          &&  3 = ] unit-test
 { t } [ 3     { [ 0 > ] [ odd? ] [ 2 + ] }    &&  5 = ] unit-test

diff --git a/basis/combinators/smart/smart-tests.factor b/basis/combinators/smart/smart-tests.factor
index ffd1e06f6246d968dcbaa2f9bc846c0450859cec..d3f8bfee25cb4258ccbc5c36e1195d9b677d74e1 100644 (file)
--- a/basis/combinators/smart/smart-tests.factor
+++ b/basis/combinators/smart/smart-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators.smart kernel math
-sequences stack-checker tools.test locals ;
+USING: accessors arrays assocs combinators.smart kernel locals
+math sequences stack-checker tools.test ;
 IN: combinators.smart.tests
 
 : test-bi ( -- 9 11 )

diff --git a/basis/command-line/command-line-tests.factor b/basis/command-line/command-line-tests.factor
index 4652c1d066d347f8fb6d73d34d46aed328668c5b..d11c69e69bb9c13192f18b6d0ff5f6ca5b6c2bc3 100644 (file)
--- a/basis/command-line/command-line-tests.factor
+++ b/basis/command-line/command-line-tests.factor
@@ -1,5 +1,4 @@
-USING: namespaces splitting tools.test ;
-IN: command-line
+USING: command-line namespaces tools.test ;
 
 { "factor" f { "a" "b" "c" } } [
     { "factor" "-run=test-voc" "a" "b" "c" } parse-command-line

diff --git a/basis/compiler/utilities/utilities-tests.factor b/basis/compiler/utilities/utilities-tests.factor
index 6e4d2d510ccf7c69d06dabb2604cead9e8355928..7eb5f76603f332ee9af8e287ae21684a17c27c1e 100644 (file)
--- a/basis/compiler/utilities/utilities-tests.factor
+++ b/basis/compiler/utilities/utilities-tests.factor
@@ -1,5 +1,4 @@
 USING: compiler.utilities kernel tools.test ;
-IN: compiler.utilities.tests
 
 {
     9