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

basis/alien/c-types/c-types-tests.factor

@@ -1,7 +1,6 @@
-USING: alien alien.syntax alien.c-types alien.parser
+USING: accessors alien.c-types alien.syntax classes
-eval kernel tools.test sequences system libc alien.strings
+classes.struct compiler.units eval io.encodings.ascii kernel
-io.encodings.ascii io.encodings.utf8 math.constants classes.struct classes
+math.constants tools.test ;
-accessors compiler.units ;
 FROM: alien.c-types => short ;
 IN: alien.c-types.tests
 

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
+USING: accessors alien.c-types alien.complex classes.struct math
-alien.c-types alien.syntax namespaces math ;
+namespaces tools.test ;
 IN: alien.complex.tests
 
 STRUCT: complex-holder

basis/alien/data/data-tests.factor

@@ -1,7 +1,6 @@
-USING: alien alien.data alien.syntax
+USING: alien alien.data alien.syntax classes.struct
-classes.struct kernel sequences specialized-arrays
+compiler.units kernel sequences specialized-arrays
-specialized-arrays.private tools.test compiler.units vocabs
+specialized-arrays.private system tools.test vocabs ;
-system ;
 QUALIFIED-WITH: alien.c-types c
 IN: alien.data.tests
 

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
+USING: accessors alien.c-types alien.endian classes.struct io
-io.encodings.binary io.streams.byte-array kernel tools.test
+io.encodings.binary io.streams.byte-array kernel tools.test ;
-alien.c-types ;
 IN: alien.endian.tests
 
 STRUCT: endian-struct

basis/alien/libraries/libraries-tests.factor

@@ -1,5 +1,4 @@
-USING: alien alien.libraries alien.syntax tools.test kernel ;
+USING: alien alien.libraries alien.syntax kernel tools.test ;
-IN: alien.libraries.tests
 
 { f } [ DLL" fadfasdfsada" dll-valid? ] unit-test
 

basis/alien/prettyprint/prettyprint-tests.factor

@@ -1,6 +1,5 @@
-USING: alien.c-types alien.prettyprint alien.syntax
+USING: alien.c-types alien.syntax io.encodings.ascii
-io.streams.string see tools.test prettyprint
+io.streams.string prettyprint see tools.test ;
-io.encodings.ascii ;
 IN: alien.prettyprint.tests
 
 CONSTANT: FOO 10

basis/alien/remote-control/remote-control-tests.factor

@@ -1,7 +1,5 @@
-USING: interpolate multiline
+USING: interpolate io io.encodings.ascii io.files io.files.temp
-io io.directories io.encodings.ascii io.files
+io.launcher io.streams.string kernel locals sequences system ;
-io.files.temp io.launcher io.streams.string kernel locals system
-tools.test sequences ;
 IN: alien.remote-control.tests
 
 : compile-file ( contents -- )

basis/ascii/ascii-tests.factor

@@ -1,5 +1,4 @@
-USING: ascii tools.test sequences kernel math strings ;
+USING: ascii kernel math sequences strings tools.test ;
-IN: ascii.tests
 
 { t } [ CHAR: a letter? ] unit-test
 { f } [ CHAR: A letter? ] unit-test

basis/base64/base64-tests.factor

@@ -1,6 +1,5 @@
-USING: kernel tools.test base64 strings sequences
+USING: base64 io.encodings.ascii io.encodings.string kernel
-io.encodings.string io.encodings.ascii ;
+sequences strings tools.test ;
-IN: base64.tests
 
 { "abcdefghijklmnopqrstuvwxyz" } [ "abcdefghijklmnopqrstuvwxyz" ascii encode >base64 base64> ascii decode
 ] unit-test

basis/biassocs/biassocs-tests.factor

@@ -1,5 +1,4 @@
-USING: biassocs assocs namespaces tools.test hashtables kernel ;
+USING: assocs biassocs hashtables kernel namespaces tools.test ;
-IN: biassocs.tests
 
 <bihash> "h" set
 

basis/binary-search/binary-search-tests.factor

@@ -1,5 +1,4 @@
-USING: binary-search math.order sequences kernel tools.test ;
+USING: binary-search kernel math.order sequences tools.test ;
-IN: binary-search.tests
 
 { f } [ 3 { } [ <=> ] with search drop ] unit-test
 { 0 } [ 3 { 3 } [ <=> ] with search drop ] unit-test

basis/bit-arrays/bit-arrays-tests.factor

@@ -1,6 +1,5 @@
-USING: alien sequences sequences.private arrays bit-arrays kernel
+USING: alien arrays bit-arrays kernel math random sequences
-tools.test math random ;
+sequences.private tools.test ;
-IN: bit-arrays.tests
 
 [ -1 <bit-array> ] [ T{ bad-array-length f -1 } = ] must-fail-with
 

basis/bit-sets/bit-sets-tests.factor

@@ -1,5 +1,4 @@
-USING: bit-sets tools.test sets kernel bit-arrays ;
+USING: bit-arrays bit-sets kernel sets tools.test ;
-IN: bit-sets.tests
 
 { T{ bit-set f ?{ t f t f t f } } } [
     T{ bit-set f ?{ t f f f t f } }

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

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
+USING: accessors bitstreams kernel tools.test ;
-grouping compression.lzw multiline byte-arrays io.encodings.binary
-io.streams.byte-array ;
-IN: bitstreams.tests
 
 { 0b1111111111 }
 [

basis/boxes/boxes-tests.factor

@@ -1,5 +1,4 @@
-USING: boxes namespaces tools.test accessors ;
+USING: accessors boxes namespaces tools.test ;
-IN: boxes.tests
 
 { } [ <box> "b" set ] unit-test
 

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 ;
+USING: byte-arrays.hex eval tools.test ;
-IN: byte-arrays.hex.tests
 
 { 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

basis/cache/cache-tests.factor

@@ -1,5 +1,5 @@
-USING: cache tools.test accessors destructors kernel assocs
+USING: accessors assocs cache destructors kernel namespaces
-namespaces ;
+tools.test ;
 IN: cache.tests
 
 TUPLE: mock-disposable < disposable n ;

basis/cairo/cairo-tests.factor

@@ -1,5 +1,4 @@
-USING: cairo tools.test math.rectangles accessors ;
+USING: accessors cairo math.rectangles tools.test ;
-IN: cairo.tests
 
 { { 10 20 } } [
     { 10 20 } [

basis/calendar/calendar-tests.factor

@@ -1,7 +1,5 @@
-USING: arrays calendar kernel math sequences tools.test
+USING: accessors kernel math.order random threads tools.test ;
-continuations system math.order threads accessors
+IN: calendar
-random ;
-IN: calendar.tests
 
 { 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

basis/calendar/format/format-tests.factor

@@ -1,6 +1,5 @@
-USING: calendar.format calendar kernel math tools.test
+USING: accessors calendar calendar.format io io.streams.string
-io.streams.string accessors io math.order sequences ;
+kernel math.order sequences tools.test ;
-IN: calendar.format.tests
 
 { 0 } [
     "Z" [ read1 read-rfc3339-gmt-offset ] with-string-reader duration>hours

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: channels kernel sequences sorting threads tools.test ;
-USING: kernel tools.test math channels channels.private
-sequences threads sorting ;
-IN: channels.tests
 
 { V{ 10 } } [
     V{ } clone <channel>

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: assocs channels channels.remote channels.remote.private
-USING: kernel tools.test math assocs channels channels.remote
+kernel tools.test ;
-channels.remote.private ;
-IN: channels.remote.tests
 
 { t } [
     remote-channels assoc?

basis/checksums/adler-32/adler-32-tests.factor

@@ -1,5 +1,4 @@
-USING: checksums.adler-32 checksums strings tools.test ;
+USING: checksums checksums.adler-32 strings tools.test ;
-IN: checksums.adler-32.tests
 
 { 300286872 } [ "Wikipedia" adler-32 checksum-bytes ] unit-test
 { 2679885283 } [ 10000 CHAR: a <string> adler-32 checksum-bytes ] unit-test

basis/checksums/bsd/bsd-tests.factor

@@ -1,5 +1,4 @@
-USING: checksums.bsd checksums strings tools.test ;
+USING: checksums checksums.bsd strings tools.test ;
-IN: checksums.bsd
 
 { 15816 } [ "Wikipedia" bsd checksum-bytes ] unit-test
 { 47937 } [ 10000 CHAR: a <string> bsd checksum-bytes ] unit-test

basis/checksums/fletcher/fletcher-tests.factor

@@ -1,5 +1,4 @@
-USING: checksums kernel sequences tools.test ;
+USING: checksums checksums.fletcher kernel sequences tools.test ;
-IN: checksums.fletcher
 
 {
     { 51440 3948201259 14034561336514601929 }

basis/checksums/fnv1/fnv1-tests.factor

@@ -1,5 +1,4 @@
-USING: checksums.fnv1 checksums strings tools.test ;
+USING: checksums checksums.fnv1 tools.test ;
-IN: checksums.fnv1.tests
 
 ! A few test vectors taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c
 

basis/checksums/hmac/hmac-tests.factor

@@ -1,7 +1,5 @@
-USING: kernel io strings byte-arrays sequences namespaces math
+USING: checksums.hmac checksums.md5 checksums.sha math.parser
-math.parser parser checksums.hmac tools.test checksums.md5
+sequences strings tools.test ;
-checksums.sha checksums ;
-IN: checksums.hmac.tests
 
 {
     "\u000092\u000094rz68\u0000bb\u00001c\u000013\u0000f4\u00008e\u0000f8\u000015\u00008b\u0000fc\u00009d"

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 ;
+USING: checksums.interleave checksums.sha tools.test ;
-IN: checksums.interleave.tests
 
 {
     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.internet.tests
-IN: checksums
 
 { B{ 255 255 } } [ { } internet checksum-bytes ] unit-test
 { B{ 254 255 } } [ { 1 } internet checksum-bytes ] unit-test

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
+io.streams.byte-array kernel math.parser sequences tools.test ;
-tools.test sequences ;
-IN: checksums.md5.tests
 
 { "d41d8cd98f00b204e9800998ecf8427e" } [ "" >byte-array md5 checksum-bytes bytes>hex-string ] unit-test
 { "0cc175b9c0f1b6a831c399e269772661" } [ "a" >byte-array md5 checksum-bytes bytes>hex-string ] unit-test

basis/checksums/murmur/murmur-tests.factor

@@ -1,6 +1,5 @@
-USING: byte-arrays checksums fry kernel math sequences
+USING: byte-arrays checksums checksums.murmur fry kernel math
-tools.test ;
+sequences tools.test ;
-IN: checksums.murmur
 
 { 455139366 } [ "asdf" >byte-array 0 <murmur3-32> checksum-bytes ] unit-test
 { 417250299 } [ "asdf" >byte-array 156 <murmur3-32> checksum-bytes ] unit-test

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 }

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
+io.encodings.binary io.streams.byte-array kernel math.parser
-math.parser namespaces sequences tools.test ;
+sequences tools.test ;
 IN: checksums.sha.tests
 
 : test-checksum ( text identifier -- checksum )

basis/checksums/superfast/superfast-tests.factor

@@ -1,6 +1,5 @@
-USING: byte-arrays checksums fry kernel math sequences
+USING: byte-arrays checksums checksums.superfast fry kernel math
-tools.test ;
+sequences tools.test ;
-IN: checksums.superfast
 
 {
     {

basis/checksums/xxhash/xxhash-tests.factor

@@ -1,5 +1,4 @@
-USING: byte-arrays checksums tools.test ;
+USING: byte-arrays checksums checksums.xxhash tools.test ;
-IN: checksums.xxhash
 
 { 1584409650 } [ "asdf" 0 <xxhash> checksum-bytes ] unit-test
 { 4257502458 } [ "Hello World!" 12345 <xxhash> checksum-bytes ] unit-test

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
+USING: classes.struct.bit-accessors effects random stack-checker
-sequences random stack-checker ;
+tools.test ;
-IN: classes.struct.bit-accessors.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

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
+assocs byte-arrays classes classes.private classes.struct
-classes.struct.prettyprint classes.struct.prettyprint.private
+classes.struct.prettyprint.private classes.tuple
-classes.tuple.parser classes.tuple.private classes.tuple
+classes.tuple.parser classes.tuple.private combinators
-combinators compiler.tree.debugger compiler.units delegate
+compiler.tree.debugger compiler.units definitions delegate
-destructors io.encodings.utf8 io.pathnames io.streams.string
+destructors eval generic generic.single io.encodings.utf8
-kernel libc literals math mirrors namespaces prettyprint
+io.streams.string kernel layouts lexer libc literals math
-prettyprint.config see sequences specialized-arrays system
+mirrors namespaces parser prettyprint prettyprint.config see
-tools.test parser lexer eval layouts generic.single classes
+sequences specialized-arrays specialized-arrays.private
-vocabs generic classes.private definitions specialized-arrays.private ;
+system tools.test vocabs ;
 FROM: math => float ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAY: char

basis/cocoa/cocoa-tests.factor

@@ -1,7 +1,6 @@
-USING: alien.c-types cocoa cocoa.messages cocoa.subclassing
+USING: alien.c-types cocoa cocoa.classes cocoa.subclassing
-cocoa.types compiler.test kernel namespaces cocoa.classes
+cocoa.types compiler.test core-graphics.types kernel math memory
-cocoa.runtime tools.test memory compiler.units math
+namespaces tools.test ;
-core-graphics.types ;
 IN: cocoa.tests
 
 CLASS: Foo < NSObject

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 ;
+USING: colors colors.constants tools.test ;
-IN: colors.constants.tests
 
 { t } [ COLOR: light-green rgba? ] unit-test

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

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 )

basis/colors/mix/mix-tests.factor

@@ -1,5 +1,4 @@
-USING: colors.constants kernel tools.test ;
+USING: colors.constants colors.mix kernel tools.test ;
-IN: colors.mix
 
 { COLOR: blue } [ COLOR: blue COLOR: red 0.0 linear-gradient ] unit-test
 { COLOR: red } [ COLOR: blue COLOR: red 1.0 linear-gradient ] unit-test

basis/columns/columns-tests.factor

@@ -1,5 +1,5 @@
-USING: columns sequences kernel namespaces arrays tools.test math ;
+USING: arrays columns kernel math namespaces sequences
-IN: columns.tests
+tools.test ;
 
 ! Columns
 { { 1 2 3 } { 4 5 6 } { 7 8 9 } } [ clone ] map "seq" set

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 ;
+USING: combinators.random combinators.random.private tools.test ;
-IN: combinators.random.tests
 
 { 1 } [ 1 [ 1 ] [ 2 ] ifp ] unit-test
 { 2 } [ 0 [ 1 ] [ 2 ] ifp ] unit-test

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

basis/combinators/short-circuit/smart/smart-tests.factor

@@ -1,5 +1,4 @@
-USING: kernel math tools.test combinators.short-circuit.smart ;
+USING: combinators.short-circuit.smart kernel math tools.test ;
-IN: combinators.short-circuit.smart.tests
 
 { t } [       { [ 1 ] [ 2 ] [ 3 ] }          &&  3 = ] unit-test
 { t } [ 3     { [ 0 > ] [ odd? ] [ 2 + ] }    &&  5 = ] unit-test

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
+USING: accessors arrays assocs combinators.smart kernel locals
-sequences stack-checker tools.test locals ;
+math sequences stack-checker tools.test ;
 IN: combinators.smart.tests
 
 : test-bi ( -- 9 11 )

basis/command-line/command-line-tests.factor

@@ -1,5 +1,4 @@
-USING: namespaces splitting tools.test ;
+USING: command-line namespaces tools.test ;
-IN: command-line
 
 { "factor" f { "a" "b" "c" } } [
     { "factor" "-run=test-voc" "a" "b" "c" } parse-command-line

basis/compiler/utilities/utilities-tests.factor

@@ -1,5 +1,4 @@
 USING: compiler.utilities kernel tools.test ;
-IN: compiler.utilities.tests
 
 {
     9