From 607de53ad3a5107273209d65257c816fb11fa412 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 25 Feb 2018 15:44:16 -0800 Subject: [PATCH] more test IN: cleanup. --- basis/compression/inflate/inflate-tests.factor | 1 - basis/compression/zlib/zlib-tests.factor | 5 +---- basis/documents/documents-tests.factor | 1 - basis/endian/endian-tests.factor | 3 +-- basis/english/english-tests.factor | 6 +++--- basis/environment/environment-tests.factor | 5 ++--- basis/eval/eval-tests.factor | 1 - basis/game/input/input-tests.factor | 1 - basis/grouping/grouping-tests.factor | 1 - basis/hash-sets/sequences/sequences-tests.factor | 2 -- basis/hashtables/sequences/sequences-tests.factor | 2 -- basis/io/directories/windows/windows-tests.factor | 1 - basis/io/encodings/iana/iana-tests.factor | 1 - basis/io/encodings/iso2022/iso2022-tests.factor | 6 +++--- .../io/encodings/shift-jis/shift-jis-tests.factor | 4 ++-- basis/io/servers/servers-tests.factor | 13 +++++-------- basis/io/sockets/icmp/icmp-tests.factor | 2 -- basis/io/standard-paths/unix/unix-tests.factor | 1 - .../io/standard-paths/windows/windows-tests.factor | 1 - basis/io/streams/limited/limited-tests.factor | 14 +++++--------- basis/io/streams/string/string-tests.factor | 1 - basis/io/streams/throwing/throwing-tests.factor | 1 - basis/lists/lazy/examples/examples-tests.factor | 1 - basis/lists/lazy/lazy-tests.factor | 1 - basis/lists/lists-tests.factor | 1 - basis/math/bits/bits-tests.factor | 1 - basis/math/complex/complex-tests.factor | 1 - basis/math/rectangles/rectangles-tests.factor | 1 - basis/math/vectors/vectors-tests.factor | 3 --- basis/nibble-arrays/nibble-arrays-tests.factor | 1 - basis/opengl/gl/extensions/extensions-tests.factor | 1 - basis/opengl/opengl-tests.factor | 1 - basis/opengl/textures/textures-tests.factor | 6 +++--- basis/pack/pack-tests.factor | 6 +----- basis/random/random-tests.factor | 1 - basis/random/sfmt/sfmt-tests.factor | 1 - basis/search-deques/search-deques-tests.factor | 5 ++--- basis/sequences/cords/cords-tests.factor | 1 - basis/sequences/merged/merged-tests.factor | 1 - basis/sequences/parser/parser-tests.factor | 1 - basis/sequences/product/product-tests.factor | 6 +----- basis/sequences/windowed/windowed-tests.factor | 1 - basis/shuffle/shuffle-tests.factor | 1 - .../simple-tokenizer/simple-tokenizer-tests.factor | 1 - basis/tools/coverage/coverage-tests.factor | 6 +++--- basis/tools/files/files-tests.factor | 1 - basis/tools/hexdump/hexdump-tests.factor | 1 - basis/tools/memory/memory-tests.factor | 1 - basis/tools/ps/ps-tests.factor | 1 - basis/tools/time/time-tests.factor | 1 - basis/validators/validators-tests.factor | 1 - basis/vlists/vlists-tests.factor | 1 - basis/vocabs/refresh/refresh-tests.factor | 1 - 53 files changed, 32 insertions(+), 98 deletions(-) diff --git a/basis/compression/inflate/inflate-tests.factor b/basis/compression/inflate/inflate-tests.factor index 443ca46e2a..7c4a959c28 100644 --- a/basis/compression/inflate/inflate-tests.factor +++ b/basis/compression/inflate/inflate-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test compression.inflate ; -IN: compression.inflate.tests { B{ diff --git a/basis/compression/zlib/zlib-tests.factor b/basis/compression/zlib/zlib-tests.factor index 034f71c35b..8bb008b2aa 100644 --- a/basis/compression/zlib/zlib-tests.factor +++ b/basis/compression/zlib/zlib-tests.factor @@ -2,10 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel tools.test compression.zlib classes ; QUALIFIED-WITH: compression.zlib.ffi ffi -IN: compression.zlib.tests -: compress-me ( -- byte-array ) B{ 1 2 3 4 5 } ; - -{ t } [ compress-me [ compress uncompress ] keep = ] unit-test +{ t } [ B{ 1 2 3 4 5 } [ compress uncompress ] keep = ] unit-test [ ffi:Z_DATA_ERROR zlib-error-message ] [ string>> "data error" = ] must-fail-with diff --git a/basis/documents/documents-tests.factor b/basis/documents/documents-tests.factor index 2bbab6db97..156643bca0 100644 --- a/basis/documents/documents-tests.factor +++ b/basis/documents/documents-tests.factor @@ -1,6 +1,5 @@ USING: documents documents.private accessors sequences namespaces tools.test make arrays kernel fry ; -IN: documents.tests ! Tests diff --git a/basis/endian/endian-tests.factor b/basis/endian/endian-tests.factor index e90bac691e..f0650cc8fd 100644 --- a/basis/endian/endian-tests.factor +++ b/basis/endian/endian-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel namespaces tools.test endian ; -IN: endian.tests +USING: endian kernel namespaces tools.test ; { t } [ [ endianness get big-endian = ] with-big-endian ] unit-test { t } [ [ endianness get little-endian = ] with-little-endian ] unit-test diff --git a/basis/english/english-tests.factor b/basis/english/english-tests.factor index 999fede063..ce64d889d4 100644 --- a/basis/english/english-tests.factor +++ b/basis/english/english-tests.factor @@ -1,6 +1,6 @@ -USING: accessors arrays assocs english.private help.markup kernel math -math.parser sequences strings tools.test ; -IN: english +USING: arrays assocs english help.markup kernel math sequences +strings tools.test ; +FROM: english => a/an ; { "record" } [ "records" singularize ] unit-test { "record" } [ "record" singularize ] unit-test diff --git a/basis/environment/environment-tests.factor b/basis/environment/environment-tests.factor index 51aedca9ad..ad881571f5 100644 --- a/basis/environment/environment-tests.factor +++ b/basis/environment/environment-tests.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel namespaces prettyprint system tools.test -environment strings sequences ; -IN: environment.tests +USING: environment kernel namespaces prettyprint sequences +strings system tools.test ; { } [ os-envs . ] unit-test diff --git a/basis/eval/eval-tests.factor b/basis/eval/eval-tests.factor index 0eaeac66c7..bb4447b50e 100644 --- a/basis/eval/eval-tests.factor +++ b/basis/eval/eval-tests.factor @@ -1,5 +1,4 @@ USING: eval tools.test ; -IN: eval.tests { 4 } [ "USE: math 2 2 +" eval( -- result ) ] unit-test [ "USE: math 2 2 +" eval( -- ) ] must-fail diff --git a/basis/game/input/input-tests.factor b/basis/game/input/input-tests.factor index 22c0b20dda..4a25e76172 100644 --- a/basis/game/input/input-tests.factor +++ b/basis/game/input/input-tests.factor @@ -1,6 +1,5 @@ USING: ui game.input tools.test kernel system threads calendar combinators.short-circuit ; -IN: game.input.tests ! os { [ windows? ] [ macosx? ] } 1|| [ ! This test only works if a mouse is present. Issue #1844 diff --git a/basis/grouping/grouping-tests.factor b/basis/grouping/grouping-tests.factor index ea3b995e4e..e2e222b6d6 100644 --- a/basis/grouping/grouping-tests.factor +++ b/basis/grouping/grouping-tests.factor @@ -1,6 +1,5 @@ USING: grouping tools.test kernel sequences arrays math accessors ; -IN: grouping.tests [ { 1 2 3 } 0 group ] must-fail diff --git a/basis/hash-sets/sequences/sequences-tests.factor b/basis/hash-sets/sequences/sequences-tests.factor index 4dd7caa4fd..e62fbd5ffd 100644 --- a/basis/hash-sets/sequences/sequences-tests.factor +++ b/basis/hash-sets/sequences/sequences-tests.factor @@ -4,8 +4,6 @@ USING: hash-sets.sequences kernel literals sequences sets tools.test ; -IN: hash-sets.sequences.tests - { t } [ 0 4 "asdf" SHS{ "asdf" } in? ] unit-test { SHS{ "asdf" } } [ diff --git a/basis/hashtables/sequences/sequences-tests.factor b/basis/hashtables/sequences/sequences-tests.factor index 979d53e862..68581fe8a2 100644 --- a/basis/hashtables/sequences/sequences-tests.factor +++ b/basis/hashtables/sequences/sequences-tests.factor @@ -4,8 +4,6 @@ USING: assocs hashtables.sequences kernel literals sequences tools.test ; -IN: hashtables.sequences.tests - { 1000 } [ 0 4 "asdf" SH{ { "asdf" 1000 } } at ] unit-test { 1001 } [ diff --git a/basis/io/directories/windows/windows-tests.factor b/basis/io/directories/windows/windows-tests.factor index 99dcd0fe2f..6162eae3c4 100644 --- a/basis/io/directories/windows/windows-tests.factor +++ b/basis/io/directories/windows/windows-tests.factor @@ -1,7 +1,6 @@ USING: accessors combinators io.directories io.files.temp io.files.windows io.pathnames kernel math sequences tools.test windows.kernel32 ; -IN: io.directories.windows.tests { { +read-only+ +archive+ } } [ "read-only.file" temp-file { diff --git a/basis/io/encodings/iana/iana-tests.factor b/basis/io/encodings/iana/iana-tests.factor index cf946df13b..812a48fa14 100644 --- a/basis/io/encodings/iana/iana-tests.factor +++ b/basis/io/encodings/iana/iana-tests.factor @@ -1,6 +1,5 @@ USING: io.encodings.iana io.encodings.iana.private io.encodings.utf8 tools.test assocs namespaces ; -IN: io.encodings.iana.tests { utf8 } [ "UTF-8" name>encoding ] unit-test { utf8 } [ "utf8" name>encoding ] unit-test diff --git a/basis/io/encodings/iso2022/iso2022-tests.factor b/basis/io/encodings/iso2022/iso2022-tests.factor index c83c66f919..f44ba755e9 100644 --- a/basis/io/encodings/iso2022/iso2022-tests.factor +++ b/basis/io/encodings/iso2022/iso2022-tests.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: io.encodings.string io.encodings.iso2022 tools.test -io.encodings.iso2022.private literals strings byte-arrays ; -IN: io.encodings.iso2022 +USING: byte-arrays io.encodings.iso2022 +io.encodings.iso2022.private io.encodings.string literals +strings tools.test ; { "hello" } [ "hello" >byte-array iso2022 decode ] unit-test { "hello" } [ "hello" iso2022 encode >string ] unit-test diff --git a/basis/io/encodings/shift-jis/shift-jis-tests.factor b/basis/io/encodings/shift-jis/shift-jis-tests.factor index 91f8a93892..8d029d0897 100644 --- a/basis/io/encodings/shift-jis/shift-jis-tests.factor +++ b/basis/io/encodings/shift-jis/shift-jis-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: io.encodings.shift-jis tools.test io.encodings.string arrays strings ; -IN: io.encodings.shift-jis.tests +USING: arrays io.encodings.shift-jis io.encodings.string strings +tools.test ; { { CHAR: replacement-character } } [ { 141 } shift-jis decode >array ] unit-test { "" } [ "" shift-jis decode >string ] unit-test diff --git a/basis/io/servers/servers-tests.factor b/basis/io/servers/servers-tests.factor index 316d1e09e3..d9e1edc5c9 100644 --- a/basis/io/servers/servers-tests.factor +++ b/basis/io/servers/servers-tests.factor @@ -1,7 +1,7 @@ -USING: accessors arrays concurrency.flags fry io io.encodings.ascii -io.encodings.utf8 io.servers.private io.sockets kernel namespaces -sequences sets threads tools.test ; -IN: io.servers +USING: accessors arrays concurrency.flags fry io +io.encodings.ascii io.encodings.utf8 io.servers +io.servers.private io.sockets kernel namespaces sequences sets +threads tools.test ; { t } [ ascii listen-on empty? ] unit-test @@ -53,12 +53,9 @@ ipv6-supported? [ ] unit-test ] unless - ! Test that we can listen on several ports at once. -TUPLE: my-threaded-server < threaded-server ; - { } [ - utf8 my-threaded-server new-threaded-server + utf8 "127.0.0.1" 0 "127.0.0.1" 0 2array >>insecure diff --git a/basis/io/sockets/icmp/icmp-tests.factor b/basis/io/sockets/icmp/icmp-tests.factor index 27529fe3f7..1801845c7e 100644 --- a/basis/io/sockets/icmp/icmp-tests.factor +++ b/basis/io/sockets/icmp/icmp-tests.factor @@ -2,8 +2,6 @@ USING: accessors destructors kernel io.sockets io.sockets.icmp sequences tools.test ; -IN: io.sockets.icmp.tests - { { } } [ "localhost" resolve-host [ [ icmp4? ] [ icmp6? ] bi or ] reject diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor index 7ea520eabb..986c0564d2 100644 --- a/basis/io/standard-paths/unix/unix-tests.factor +++ b/basis/io/standard-paths/unix/unix-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: environment io.standard-paths io.standard-paths.unix sequences tools.test ; -IN: io.standard-paths.unix.tests { f } [ "" find-in-path ] unit-test { t } [ diff --git a/basis/io/standard-paths/windows/windows-tests.factor b/basis/io/standard-paths/windows/windows-tests.factor index 87f373a1ee..4daa7f9b2b 100644 --- a/basis/io/standard-paths/windows/windows-tests.factor +++ b/basis/io/standard-paths/windows/windows-tests.factor @@ -2,6 +2,5 @@ ! See http://factorcode.org/license.txt for BSD license. USING: io.standard-paths io.standard-paths.windows sequences tools.test ; -IN: io.standard-paths.windows.tests [ t ] [ "cmd.exe" find-in-path "cmd.exe" tail? ] unit-test diff --git a/basis/io/streams/limited/limited-tests.factor b/basis/io/streams/limited/limited-tests.factor index 092949c8df..508df24c44 100644 --- a/basis/io/streams/limited/limited-tests.factor +++ b/basis/io/streams/limited/limited-tests.factor @@ -1,10 +1,8 @@ -USING: accessors continuations destructors io io.encodings -io.encodings.ascii io.encodings.binary -io.encodings.string io.encodings.utf8 io.files io.pipes -io.streams.byte-array io.streams.duplex io.streams.limited io.streams.string -kernel namespaces strings tools.test system -io.encodings.8-bit.latin1 ; -IN: io.streams.limited.tests +USING: destructors io io.encodings io.encodings.8-bit.latin1 +io.encodings.ascii io.encodings.binary io.encodings.string +io.encodings.utf8 io.files io.pipes io.streams.byte-array +io.streams.duplex io.streams.limited io.streams.string kernel +namespaces strings tools.test ; { } [ "hello world\nhow are you today\nthis is a very long line indeed" @@ -25,7 +23,6 @@ IN: io.streams.limited.tests { f } [ "decoded" get stream-readln ] unit-test - { } [ "abc\ndef\nghi" ascii encode binary "data" set @@ -38,7 +35,6 @@ IN: io.streams.limited.tests { "" f } [ "\n" "limited" get stream-read-until [ >string ] dip ] unit-test - { CHAR: a } [ "a" 1 stream-read1 ] unit-test diff --git a/basis/io/streams/string/string-tests.factor b/basis/io/streams/string/string-tests.factor index 0385e89670..82bf549f53 100644 --- a/basis/io/streams/string/string-tests.factor +++ b/basis/io/streams/string/string-tests.factor @@ -1,6 +1,5 @@ USING: io.streams.string io kernel arrays namespaces make tools.test ; -IN: io.streams.string.tests { "" } [ "" [ contents ] with-string-reader ] unit-test diff --git a/basis/io/streams/throwing/throwing-tests.factor b/basis/io/streams/throwing/throwing-tests.factor index db203e7130..4f5f0370b6 100644 --- a/basis/io/streams/throwing/throwing-tests.factor +++ b/basis/io/streams/throwing/throwing-tests.factor @@ -3,7 +3,6 @@ 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 ; -IN: io.streams.throwing.tests { "asdf" } [ diff --git a/basis/lists/lazy/examples/examples-tests.factor b/basis/lists/lazy/examples/examples-tests.factor index 658a5982d0..66f5863f1b 100644 --- a/basis/lists/lazy/examples/examples-tests.factor +++ b/basis/lists/lazy/examples/examples-tests.factor @@ -1,5 +1,4 @@ USING: lists.lazy.examples lists.lazy lists tools.test ; -IN: lists.lazy.examples.tests { { 1 3 5 7 } } [ 4 odds ltake list>array ] unit-test { { 0 1 4 9 16 } } [ first-five-squares ] unit-test diff --git a/basis/lists/lazy/lazy-tests.factor b/basis/lists/lazy/lazy-tests.factor index d73c557d3d..5aa42dd2bb 100644 --- a/basis/lists/lazy/lazy-tests.factor +++ b/basis/lists/lazy/lazy-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: destructors io io.encodings.utf8 io.files kernel lists lists.lazy math sequences tools.test ; -IN: lists.lazy.tests { { 1 2 3 4 } } [ { 1 2 3 4 } >list list>array diff --git a/basis/lists/lists-tests.factor b/basis/lists/lists-tests.factor index d9b6fbd5d9..f6f6a04975 100644 --- a/basis/lists/lists-tests.factor +++ b/basis/lists/lists-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2008 James Cash ! See http://factorcode.org/license.txt for BSD license. USING: tools.test lists math kernel ; -IN: lists.tests { { 3 4 5 6 7 } } [ { 1 2 3 4 5 } sequence>list [ 2 + ] lmap list>array diff --git a/basis/math/bits/bits-tests.factor b/basis/math/bits/bits-tests.factor index 3fc713ca23..c8d038acc5 100644 --- a/basis/math/bits/bits-tests.factor +++ b/basis/math/bits/bits-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. USING: tools.test math math.bits sequences arrays ; -IN: math.bits.tests { t } [ 0b111111 3 second ] unit-test { { t t t } } [ 0b111111 3 >array ] unit-test diff --git a/basis/math/complex/complex-tests.factor b/basis/math/complex/complex-tests.factor index 1a752c0e01..6819efd06a 100644 --- a/basis/math/complex/complex-tests.factor +++ b/basis/math/complex/complex-tests.factor @@ -1,7 +1,6 @@ USING: kernel math math.constants math.functions math.order tools.test prettyprint prettyprint.config namespaces eval accessors ; -IN: math.complex.tests [ 1 C{ 0 1 } rect> ] must-fail [ C{ 0 1 } 1 rect> ] must-fail diff --git a/basis/math/rectangles/rectangles-tests.factor b/basis/math/rectangles/rectangles-tests.factor index e898be4449..f439e09b43 100644 --- a/basis/math/rectangles/rectangles-tests.factor +++ b/basis/math/rectangles/rectangles-tests.factor @@ -1,6 +1,5 @@ USING: tools.test math.rectangles prettyprint io.streams.string kernel accessors ; -IN: math.rectangles.tests { RECT: { 10 10 } { 20 20 } } [ diff --git a/basis/math/vectors/vectors-tests.factor b/basis/math/vectors/vectors-tests.factor index fa5a265607..bf4e99ee5a 100644 --- a/basis/math/vectors/vectors-tests.factor +++ b/basis/math/vectors/vectors-tests.factor @@ -1,4 +1,3 @@ -IN: math.vectors.tests USING: math.vectors tools.test kernel specialized-arrays compiler kernel.private alien.c-types math.functions ; SPECIALIZED-ARRAY: int @@ -35,7 +34,6 @@ SPECIALIZED-ARRAY: int { 1 } [ { C{ 0 1 } } dup h. ] unit-test - { { 1 2 3 } } [ { t t t } [ { 1 2 3 } ] [ { 4 5 6 } ] vif ] unit-test @@ -48,7 +46,6 @@ SPECIALIZED-ARRAY: int { t f t } [ { 1 2 3 } ] [ { 4 5 6 } ] vif ] unit-test -! vclamp { { 0 30 100 } } [ { -10 30 120 } { 0 0 0 } { 100 100 100 } vclamp ] unit-test diff --git a/basis/nibble-arrays/nibble-arrays-tests.factor b/basis/nibble-arrays/nibble-arrays-tests.factor index 77610111da..21b5df1e3f 100644 --- a/basis/nibble-arrays/nibble-arrays-tests.factor +++ b/basis/nibble-arrays/nibble-arrays-tests.factor @@ -1,5 +1,4 @@ USING: nibble-arrays tools.test sequences kernel math ; -IN: nibble-arrays.tests [ -1 ] [ T{ bad-array-length f -1 } = ] must-fail-with diff --git a/basis/opengl/gl/extensions/extensions-tests.factor b/basis/opengl/gl/extensions/extensions-tests.factor index 4e87d9da86..5e9b496137 100644 --- a/basis/opengl/gl/extensions/extensions-tests.factor +++ b/basis/opengl/gl/extensions/extensions-tests.factor @@ -1,5 +1,4 @@ USING: alien kernel opengl.gl.extensions system tools.test ; -IN: opengl.gl.extensions.tests { t } [ gl-function-calling-convention diff --git a/basis/opengl/opengl-tests.factor b/basis/opengl/opengl-tests.factor index 818d0db8b7..5589c517a5 100644 --- a/basis/opengl/opengl-tests.factor +++ b/basis/opengl/opengl-tests.factor @@ -1,5 +1,4 @@ USING: tools.test math opengl opengl.gl ; -IN: opengl.tests { 2 1 } [ { GL_TEXTURE_2D } [ + ] all-enabled ] must-infer-as diff --git a/basis/opengl/textures/textures-tests.factor b/basis/opengl/textures/textures-tests.factor index 2a7cfdaf8c..6fe209fdf5 100644 --- a/basis/opengl/textures/textures-tests.factor +++ b/basis/opengl/textures/textures-tests.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: tools.test opengl.gl opengl.textures opengl.textures.private -images kernel namespaces accessors sequences literals ; -IN: opengl.textures.tests + +USING: accessors images kernel literals opengl.gl +opengl.textures opengl.textures.private sequences tools.test ; { { diff --git a/basis/pack/pack-tests.factor b/basis/pack/pack-tests.factor index cf31e12585..e07783d10a 100644 --- a/basis/pack/pack-tests.factor +++ b/basis/pack/pack-tests.factor @@ -1,6 +1,5 @@ USING: alien.c-types io io.streams.string kernel make namespaces pack pack.private strings tools.test ; -IN: pack.tests { B{ 1 0 2 0 0 3 0 0 0 4 0 0 0 0 0 0 0 5 } } [ { 1 2 3 4 5 } @@ -49,10 +48,7 @@ IN: pack.tests [ "iii" pack ] must-infer [ "iii" unpack ] must-infer -: test-pack ( str -- ba ) - "iii" pack ; - -[ test-pack ] must-infer +[ "iii" pack ] must-infer { "c" } [ "1c" expand-pack-format ] unit-test { "cccc" } [ "4c" expand-pack-format ] unit-test diff --git a/basis/random/random-tests.factor b/basis/random/random-tests.factor index 8ab979019b..92d5c69953 100644 --- a/basis/random/random-tests.factor +++ b/basis/random/random-tests.factor @@ -1,6 +1,5 @@ USING: random sequences tools.test kernel math math.constants math.functions sets grouping random.private math.statistics ; -IN: random.tests { 4 } [ 4 random-bytes length ] unit-test { 7 } [ 7 random-bytes length ] unit-test diff --git a/basis/random/sfmt/sfmt-tests.factor b/basis/random/sfmt/sfmt-tests.factor index 4268d5f001..25e348c9ac 100644 --- a/basis/random/sfmt/sfmt-tests.factor +++ b/basis/random/sfmt/sfmt-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel random random.sfmt random.sfmt.private sequences tools.test ; -IN: random.sfmt.tests ! Period certified by virtue of seed { } [ 5 drop ] unit-test diff --git a/basis/search-deques/search-deques-tests.factor b/basis/search-deques/search-deques-tests.factor index 034a0a1dda..b0121b042e 100644 --- a/basis/search-deques/search-deques-tests.factor +++ b/basis/search-deques/search-deques-tests.factor @@ -1,6 +1,5 @@ -IN: search-deques.tests -USING: search-deques tools.test namespaces -kernel sequences words deques vocabs dlists ; +USING: deques dlists kernel namespaces sequences tools.test +vocabs ; "h" set diff --git a/basis/sequences/cords/cords-tests.factor b/basis/sequences/cords/cords-tests.factor index 943ccd1703..adbea9e761 100644 --- a/basis/sequences/cords/cords-tests.factor +++ b/basis/sequences/cords/cords-tests.factor @@ -1,4 +1,3 @@ USING: sequences.cords strings tools.test kernel sequences ; -IN: sequences.cords.tests { "hello world" } [ "hello" " world" cord-append dup like ] unit-test diff --git a/basis/sequences/merged/merged-tests.factor b/basis/sequences/merged/merged-tests.factor index a6d97584f8..af9ab0ec43 100644 --- a/basis/sequences/merged/merged-tests.factor +++ b/basis/sequences/merged/merged-tests.factor @@ -1,5 +1,4 @@ USING: sequences sequences.merged tools.test ; -IN: sequences.merged.tests { 0 { 1 2 } } [ 0 T{ merged f { { 1 2 } { 3 4 } } } virtual@ ] unit-test { 0 { 3 4 } } [ 1 T{ merged f { { 1 2 } { 3 4 } } } virtual@ ] unit-test diff --git a/basis/sequences/parser/parser-tests.factor b/basis/sequences/parser/parser-tests.factor index 50ae22b3dd..d641464acf 100644 --- a/basis/sequences/parser/parser-tests.factor +++ b/basis/sequences/parser/parser-tests.factor @@ -1,5 +1,4 @@ USING: tools.test sequences.parser unicode kernel accessors ; -IN: sequences.parser.tests { "hello" } [ "hello" [ take-rest ] parse-sequence ] unit-test diff --git a/basis/sequences/product/product-tests.factor b/basis/sequences/product/product-tests.factor index 3e96b706fe..5dfe79d04e 100644 --- a/basis/sequences/product/product-tests.factor +++ b/basis/sequences/product/product-tests.factor @@ -1,16 +1,12 @@ ! Copyright (C) 2009 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel make sequences sequences.product tools.test ; -IN: sequences.product.tests - { { { 0 "a" } { 1 "a" } { 2 "a" } { 0 "b" } { 1 "b" } { 2 "b" } } } [ { { 0 1 2 } { "a" "b" } } >array ] unit-test -: x ( n s -- sss ) concat ; - { { "a" "aa" "aaa" "b" "bb" "bbb" } } -[ { { 1 2 3 } { "a" "b" } } [ first2 x ] product-map ] unit-test +[ { { 1 2 3 } { "a" "b" } } [ first2 concat ] product-map ] unit-test { { diff --git a/basis/sequences/windowed/windowed-tests.factor b/basis/sequences/windowed/windowed-tests.factor index cb1ac0e1b1..d6b936c58a 100644 --- a/basis/sequences/windowed/windowed-tests.factor +++ b/basis/sequences/windowed/windowed-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2012 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: arrays sequences sequences.windowed tools.test ; -IN: sequences.windowed.tests { { { 1 } { 1 2 } { 1 2 3 } { 2 3 4 } { 3 4 5 } { 4 5 6 } } } [ { 1 2 3 4 5 6 } 3 [ >array ] map ] unit-test diff --git a/basis/shuffle/shuffle-tests.factor b/basis/shuffle/shuffle-tests.factor index 2058a252db..4d176f7b32 100644 --- a/basis/shuffle/shuffle-tests.factor +++ b/basis/shuffle/shuffle-tests.factor @@ -1,5 +1,4 @@ USING: shuffle tools.test ; -IN: shuffle.tests { 1 2 3 4 } [ 3 4 1 2 2swap ] unit-test diff --git a/basis/simple-tokenizer/simple-tokenizer-tests.factor b/basis/simple-tokenizer/simple-tokenizer-tests.factor index 060d254eed..0425fcae63 100644 --- a/basis/simple-tokenizer/simple-tokenizer-tests.factor +++ b/basis/simple-tokenizer/simple-tokenizer-tests.factor @@ -1,4 +1,3 @@ -IN: simple-tokenizer.tests USING: simple-tokenizer tools.test ; [ "" tokenize ] must-fail diff --git a/basis/tools/coverage/coverage-tests.factor b/basis/tools/coverage/coverage-tests.factor index 6e03bced33..ff7cb34f47 100644 --- a/basis/tools/coverage/coverage-tests.factor +++ b/basis/tools/coverage/coverage-tests.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2014 Jon Harper. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel sequences sorting tools.coverage -tools.coverage.private tools.coverage.testvocab tools.coverage.testvocab.child -tools.coverage.testvocab.private tools.test vocabs.loader ; -IN: tools.coverage.tests +tools.coverage.private tools.coverage.testvocab +tools.coverage.testvocab.child tools.coverage.testvocab.private +tools.test vocabs.loader ; { "foo.private" } [ "foo" private-vocab-name ] unit-test { "foo.private" } [ "foo.private" private-vocab-name ] unit-test diff --git a/basis/tools/files/files-tests.factor b/basis/tools/files/files-tests.factor index 52ff5ed5ea..a7ef8d82c4 100644 --- a/basis/tools/files/files-tests.factor +++ b/basis/tools/files/files-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test tools.files strings kernel ; -IN: tools.files.tests { } [ "" directory. ] unit-test diff --git a/basis/tools/hexdump/hexdump-tests.factor b/basis/tools/hexdump/hexdump-tests.factor index ff1cb85bc0..f85a6d4bb5 100644 --- a/basis/tools/hexdump/hexdump-tests.factor +++ b/basis/tools/hexdump/hexdump-tests.factor @@ -1,5 +1,4 @@ USING: tools.hexdump kernel sequences tools.test byte-arrays ; -IN: tools.hexdump.tests { t } [ B{ } hexdump "Length: 0, 0h\n" = ] unit-test { t } [ "abcdefghijklmnopqrstuvwxyz" >byte-array hexdump "Length: 26, 1ah\n00000000h: 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 abcdefghijklmnop\n00000010h: 71 72 73 74 75 76 77 78 79 7a qrstuvwxyz\n" = ] unit-test diff --git a/basis/tools/memory/memory-tests.factor b/basis/tools/memory/memory-tests.factor index e1ba5c45d6..382cb29082 100644 --- a/basis/tools/memory/memory-tests.factor +++ b/basis/tools/memory/memory-tests.factor @@ -1,6 +1,5 @@ USING: arrays assocs kernel math memory namespaces parser sequences tools.memory tools.memory.private tools.test tools.time vm ; -IN: tools.memory.tests { } [ room. ] unit-test { } [ heap-stats. ] unit-test diff --git a/basis/tools/ps/ps-tests.factor b/basis/tools/ps/ps-tests.factor index 01c7245a7a..cc9202a1a3 100644 --- a/basis/tools/ps/ps-tests.factor +++ b/basis/tools/ps/ps-tests.factor @@ -1,4 +1,3 @@ USING: tools.ps tools.test ; -IN: tools.ps.tests { } [ ps. ] unit-test diff --git a/basis/tools/time/time-tests.factor b/basis/tools/time/time-tests.factor index cefffc74d1..d743754da2 100644 --- a/basis/tools/time/time-tests.factor +++ b/basis/tools/time/time-tests.factor @@ -1,4 +1,3 @@ -IN: tools.time.tests USING: tools.time tools.test compiler.test ; { } [ [ [ ] time ] compile-call ] unit-test diff --git a/basis/validators/validators-tests.factor b/basis/validators/validators-tests.factor index 1685a99626..3fb1dc6bcb 100644 --- a/basis/validators/validators-tests.factor +++ b/basis/validators/validators-tests.factor @@ -1,4 +1,3 @@ -IN: validators.tests USING: kernel sequences tools.test validators accessors namespaces assocs ; diff --git a/basis/vlists/vlists-tests.factor b/basis/vlists/vlists-tests.factor index 22f2d91315..98993181a8 100644 --- a/basis/vlists/vlists-tests.factor +++ b/basis/vlists/vlists-tests.factor @@ -1,6 +1,5 @@ USING: vlists kernel persistent.sequences arrays tools.test namespaces accessors sequences assocs ; -IN: vlists.tests { { "hi" "there" } } [ VL{ } "hi" swap ppush "there" swap ppush >array ] unit-test diff --git a/basis/vocabs/refresh/refresh-tests.factor b/basis/vocabs/refresh/refresh-tests.factor index e4cfdc96fc..61363aa2d7 100644 --- a/basis/vocabs/refresh/refresh-tests.factor +++ b/basis/vocabs/refresh/refresh-tests.factor @@ -1,4 +1,3 @@ -IN: vocabs.refresh.tests USING: vocabs.refresh tools.test continuations namespaces ; { } [ -- 2.34.1