From: John Benediktsson Date: Thu, 15 Feb 2018 16:45:08 +0000 (-0800) Subject: more test IN: cleanup. X-Git-Tag: 0.98~308 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=4a144e5ea7f9fc0f9f155e5b18d108906d22f1dc more test IN: cleanup. --- diff --git a/basis/math/combinatorics/combinatorics-tests.factor b/basis/math/combinatorics/combinatorics-tests.factor index 55fca4b72b..0587ca4443 100644 --- a/basis/math/combinatorics/combinatorics-tests.factor +++ b/basis/math/combinatorics/combinatorics-tests.factor @@ -1,6 +1,5 @@ USING: arrays kernel math math.combinatorics math.combinatorics.private tools.test sequences ; -IN: math.combinatorics.tests { 1 } [ -1 factorial ] unit-test ! required by other math.combinatorics words { 1 } [ 0 factorial ] unit-test diff --git a/extra/24-game/24-game-tests.factor b/extra/24-game/24-game-tests.factor index d68b389698..959001b087 100644 --- a/extra/24-game/24-game-tests.factor +++ b/extra/24-game/24-game-tests.factor @@ -1,5 +1,5 @@ -USING: 24-game io.streams.string kernel math sequences tools.test ; -IN: 24-game.tests +USING: 24-game io.streams.string kernel math sequences +tools.test ; { t } [ make-24 first4 makes-24? ] unit-test diff --git a/extra/99-bottles/99-bottles-tests.factor b/extra/99-bottles/99-bottles-tests.factor index 0f71c7130c..d668ee0eae 100644 --- a/extra/99-bottles/99-bottles-tests.factor +++ b/extra/99-bottles/99-bottles-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2011 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: 99-bottles io.streams.string tools.test ; -IN: 99-bottles.tests { "99 bottles of beer on the wall, 99 bottles of beer. diff --git a/extra/arrays/shaped/shaped-tests.factor b/extra/arrays/shaped/shaped-tests.factor index 07c62f6355..f1c05a330c 100644 --- a/extra/arrays/shaped/shaped-tests.factor +++ b/extra/arrays/shaped/shaped-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2012 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays.shaped kernel math sequences tools.test ; -IN: arrays.shaped.tests { t } [ { 5 5 } increasing diff --git a/extra/asn1/asn1-tests.factor b/extra/asn1/asn1-tests.factor index 9e56459a04..ee2575e09e 100644 --- a/extra/asn1/asn1-tests.factor +++ b/extra/asn1/asn1-tests.factor @@ -1,5 +1,4 @@ USING: asn1 asn1.ldap io io.streams.string tools.test ; -IN: asn1.tests { 6 } [ "\u000002\u000001\u000006" [ asn-syntax read-ber ] with-string-reader diff --git a/extra/assocs/extras/extras-tests.factor b/extra/assocs/extras/extras-tests.factor index ea7e7f8dbb..05c7ca8251 100644 --- a/extra/assocs/extras/extras-tests.factor +++ b/extra/assocs/extras/extras-tests.factor @@ -1,8 +1,6 @@ USING: assocs.extras kernel sequences tools.test ; -IN: assocs.extras - { f } [ f { } deep-at ] unit-test { f } [ f { "foo" } deep-at ] unit-test { f } [ H{ } { 1 2 3 } deep-at ] unit-test diff --git a/extra/backtrack/backtrack-tests.factor b/extra/backtrack/backtrack-tests.factor index 7fb2c55752..034c0cb0e0 100644 --- a/extra/backtrack/backtrack-tests.factor +++ b/extra/backtrack/backtrack-tests.factor @@ -1,7 +1,6 @@ ! Copyright (c) 2009 Samuel Tardieu. ! See See http://factorcode.org/license.txt for BSD license. USING: backtrack math tools.test ; -IN: backtrack.tests cut-amb { 1 } [ { 1 2 } amb ] unit-test diff --git a/extra/base85/base85-tests.factor b/extra/base85/base85-tests.factor index 2b3171fd7b..d190d7483e 100644 --- a/extra/base85/base85-tests.factor +++ b/extra/base85/base85-tests.factor @@ -1,5 +1,4 @@ USING: kernel strings tools.test ; -IN: base85 { t } [ "Hello, world" dup >base85 base85> >string = ] unit-test diff --git a/extra/benchmark/regex-dna/regex-dna-tests.factor b/extra/benchmark/regex-dna/regex-dna-tests.factor index e0ae048c88..3290e47842 100644 --- a/extra/benchmark/regex-dna/regex-dna-tests.factor +++ b/extra/benchmark/regex-dna/regex-dna-tests.factor @@ -1,6 +1,5 @@ USING: benchmark.regex-dna io io.files io.encodings.ascii io.streams.string kernel tools.test splitting ; -IN: benchmark.regex-dna.tests { t } [ "resource:extra/benchmark/regex-dna/regex-dna-test-in.txt" diff --git a/extra/benchmark/reverse-complement/reverse-complement-tests.factor b/extra/benchmark/reverse-complement/reverse-complement-tests.factor index d0f1918bda..0c253b0812 100644 --- a/extra/benchmark/reverse-complement/reverse-complement-tests.factor +++ b/extra/benchmark/reverse-complement/reverse-complement-tests.factor @@ -1,4 +1,3 @@ -IN: benchmark.reverse-complement.tests USING: benchmark.reverse-complement checksums checksums.md5 io.files io.files.temp kernel math.parser tools.test ; diff --git a/extra/bencode/bencode-tests.factor b/extra/bencode/bencode-tests.factor index e97de29d50..1d18c6c205 100644 --- a/extra/bencode/bencode-tests.factor +++ b/extra/bencode/bencode-tests.factor @@ -1,5 +1,4 @@ -USING: tools.test ; -IN: bencode +USING: bencode tools.test ; { "i42e" } [ 42 >bencode ] unit-test { "i0e" } [ 0 >bencode ] unit-test diff --git a/extra/boyer-moore/boyer-moore-tests.factor b/extra/boyer-moore/boyer-moore-tests.factor index 23e8bef9d8..ef5a9e18c6 100644 --- a/extra/boyer-moore/boyer-moore-tests.factor +++ b/extra/boyer-moore/boyer-moore-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Dmitry Shubin. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test boyer-moore ; -IN: boyer-moore.tests { 0 } [ "qwerty" "" search ] unit-test { 0 } [ "" "" search ] unit-test diff --git a/extra/brainfuck/brainfuck-tests.factor b/extra/brainfuck/brainfuck-tests.factor index 2f8aa2909e..f40608eac3 100644 --- a/extra/brainfuck/brainfuck-tests.factor +++ b/extra/brainfuck/brainfuck-tests.factor @@ -4,9 +4,6 @@ USING: brainfuck io.streams.string kernel literals math math.parser math.ranges sequences tools.test ; -IN: brainfuck - - [ "+" run-brainfuck ] must-infer [ "+" get-brainfuck ] must-infer diff --git a/extra/calendar/elapsed/elapsed-tests.factor b/extra/calendar/elapsed/elapsed-tests.factor index 4373f4f207..e3faae7f2b 100644 --- a/extra/calendar/elapsed/elapsed-tests.factor +++ b/extra/calendar/elapsed/elapsed-tests.factor @@ -3,8 +3,6 @@ USING: calendar calendar.elapsed kernel tools.test ; -IN: calendar.elapsed.tests - [ -1 elapsed-time ] [ "negative seconds" = ] must-fail-with { "0s" } [ 0 elapsed-time ] unit-test diff --git a/extra/calendar/holidays/canada/canada-tests.factor b/extra/calendar/holidays/canada/canada-tests.factor index 1ebafdae7f..379428834e 100644 --- a/extra/calendar/holidays/canada/canada-tests.factor +++ b/extra/calendar/holidays/canada/canada-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: calendar.holidays calendar.holidays.canada kernel -tools.test ; -IN: calendar.holidays.canada.tests +sequences tools.test ; -{ } [ 2009 canada holidays drop ] unit-test +{ 1 } [ 2009 canadian-federal holidays length ] unit-test diff --git a/extra/calendar/holidays/us/us-tests.factor b/extra/calendar/holidays/us/us-tests.factor index 61396ea060..67ac8fc1ed 100644 --- a/extra/calendar/holidays/us/us-tests.factor +++ b/extra/calendar/holidays/us/us-tests.factor @@ -2,6 +2,5 @@ ! See http://factorcode.org/license.txt for BSD license. USING: calendar.holidays calendar.holidays.us kernel sequences tools.test ; -IN: calendar.holidays.us.tests { 10 } [ 2009 us-federal holidays length ] unit-test diff --git a/extra/checksums/process/process-tests.factor b/extra/checksums/process/process-tests.factor index 7cf12cdb4e..819e234f4c 100644 --- a/extra/checksums/process/process-tests.factor +++ b/extra/checksums/process/process-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2016 Alexander Ilin. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test checksums.process ; -IN: checksums.process.tests { "" } [ "" trim-hash ] unit-test { "" } [ " aoeu" trim-hash ] unit-test diff --git a/extra/color-table/color-table-tests.factor b/extra/color-table/color-table-tests.factor deleted file mode 100644 index 69f754dce8..0000000000 --- a/extra/color-table/color-table-tests.factor +++ /dev/null @@ -1,4 +0,0 @@ -! Copyright (C) 2009 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: tools.test color-table ; -IN: color-table.tests diff --git a/extra/colors/cmyk/cmyk-tests.factor b/extra/colors/cmyk/cmyk-tests.factor index 071bb83a64..bd9894d5c1 100644 --- a/extra/colors/cmyk/cmyk-tests.factor +++ b/extra/colors/cmyk/cmyk-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.cmyk +USING: arrays colors colors.cmyk kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/distances/distances-tests.factor b/extra/colors/distances/distances-tests.factor index f73bfb2fb3..cd5df436d6 100644 --- a/extra/colors/distances/distances-tests.factor +++ b/extra/colors/distances/distances-tests.factor @@ -1,5 +1,4 @@ -USING: colors combinators tools.test ; -IN: colors.distances +USING: colors colors.distances combinators tools.test ; { 0x1.05d584e1086dep6 ! 65.45851470579098 diff --git a/extra/colors/flex-hex/flex-hex-tests.factor b/extra/colors/flex-hex/flex-hex-tests.factor index 036f7fe257..0578f5f123 100644 --- a/extra/colors/flex-hex/flex-hex-tests.factor +++ b/extra/colors/flex-hex/flex-hex-tests.factor @@ -1,6 +1,4 @@ -USING: tools.test ; - -IN: colors.flex-hex +USING: colors.flex-hex tools.test ; { "00b000" } [ "#zqbttv" flex-hex ] unit-test diff --git a/extra/colors/hsl/hsl-tests.factor b/extra/colors/hsl/hsl-tests.factor index 8b12019e6f..09fafa6b2e 100644 --- a/extra/colors/hsl/hsl-tests.factor +++ b/extra/colors/hsl/hsl-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.hsl +USING: arrays colors colors.hsl kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/lab/lab-tests.factor b/extra/colors/lab/lab-tests.factor index c1af98930e..3790bd2803 100644 --- a/extra/colors/lab/lab-tests.factor +++ b/extra/colors/lab/lab-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.lab +USING: arrays colors colors.lab kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/lch/lch-tests.factor b/extra/colors/lch/lch-tests.factor index 9717a6f762..6811cfbda5 100644 --- a/extra/colors/lch/lch-tests.factor +++ b/extra/colors/lch/lch-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.lch +USING: arrays colors colors.lch kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/luv/luv-tests.factor b/extra/colors/luv/luv-tests.factor index 6f4f7f7242..c47365ae2f 100644 --- a/extra/colors/luv/luv-tests.factor +++ b/extra/colors/luv/luv-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.luv +USING: arrays colors colors.luv kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/ryb/ryb-tests.factor b/extra/colors/ryb/ryb-tests.factor index e8922e382e..18bcd3812e 100644 --- a/extra/colors/ryb/ryb-tests.factor +++ b/extra/colors/ryb/ryb-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.ryb +USING: arrays colors colors.ryb kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/xyy/xyy-tests.factor b/extra/colors/xyy/xyy-tests.factor index 4907ae68c2..d4c0b3ac4a 100644 --- a/extra/colors/xyy/xyy-tests.factor +++ b/extra/colors/xyy/xyy-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.xyy +USING: arrays colors colors.xyy kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/xyz/xyz-tests.factor b/extra/colors/xyz/xyz-tests.factor index 0c0b1da834..7984859f00 100644 --- a/extra/colors/xyz/xyz-tests.factor +++ b/extra/colors/xyz/xyz-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.xyz +USING: arrays colors colors.xyz kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/yiq/yiq-tests.factor b/extra/colors/yiq/yiq-tests.factor index 0be6b2d57c..dbb5b3f5b2 100644 --- a/extra/colors/yiq/yiq-tests.factor +++ b/extra/colors/yiq/yiq-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.yiq +USING: arrays colors colors.yiq kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/colors/yuv/yuv-tests.factor b/extra/colors/yuv/yuv-tests.factor index eba32266b2..024e7d4528 100644 --- a/extra/colors/yuv/yuv-tests.factor +++ b/extra/colors/yuv/yuv-tests.factor @@ -1,10 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays colors kernel locals math.functions math.ranges -sequences tools.test ; - -IN: colors.yuv +USING: arrays colors colors.yuv kernel locals math.functions +math.ranges sequences tools.test ; { t } [ 0.0 1.0 0.1 [| r | diff --git a/extra/combinators/extras/extras-tests.factor b/extra/combinators/extras/extras-tests.factor index dc9e7fa7c5..3ca171eb05 100644 --- a/extra/combinators/extras/extras-tests.factor +++ b/extra/combinators/extras/extras-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: combinators.extras io.files kernel math sequences tools.test ; -IN: combinators.extras.tests { "a b" } [ "a" "b" [ " " glue ] once ] unit-test diff --git a/extra/ctags/ctags-tests.factor b/extra/ctags/ctags-tests.factor index 5c502c2dee..420b5bd4b5 100644 --- a/extra/ctags/ctags-tests.factor +++ b/extra/ctags/ctags-tests.factor @@ -1,6 +1,5 @@ USING: arrays ctags.private io.backend kernel sequences tools.test ; -IN: ctags.tests { t } [ "if\t" "resource:extra/unix/unix.factor" normalize-path "\t91" 3append diff --git a/extra/cuesheet/cuesheet-tests.factor b/extra/cuesheet/cuesheet-tests.factor index 3d986e4439..738e494931 100644 --- a/extra/cuesheet/cuesheet-tests.factor +++ b/extra/cuesheet/cuesheet-tests.factor @@ -1,5 +1,4 @@ -USING: tools.test ; -IN: cuesheet +USING: cuesheet tools.test ; { T{ cuesheet diff --git a/extra/dice/dice-tests.factor b/extra/dice/dice-tests.factor index 58a1a957fe..8dee113934 100644 --- a/extra/dice/dice-tests.factor +++ b/extra/dice/dice-tests.factor @@ -1,5 +1,4 @@ -USING: kernel math tools.test ; -IN: dice +USING: dice kernel math tools.test ; { [ 1 4 random-roll ] } [ "1d4" roll-quot ] unit-test { [ 1 4 random-roll 3 + ] } [ "1d4+3" roll-quot ] unit-test diff --git a/extra/elf/elf-tests.factor b/extra/elf/elf-tests.factor index 4d1bb5be06..b66afd8916 100644 --- a/extra/elf/elf-tests.factor +++ b/extra/elf/elf-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. USING: accessors byte-arrays elf kernel sequences system tools.test ; -IN: elf.tests cpu ppc? [ { diff --git a/extra/enigma/enigma-tests.factor b/extra/enigma/enigma-tests.factor index 93a1030532..e07c2bb961 100644 --- a/extra/enigma/enigma-tests.factor +++ b/extra/enigma/enigma-tests.factor @@ -1,8 +1,6 @@ USING: enigma kernel math sequences sorting tools.test ; -IN: enigma.tests - { t } [ natural-sort 26 sequence= ] unit-test { "" } [ "" 4 encode ] unit-test diff --git a/extra/fftw/fftw-tests.factor b/extra/fftw/fftw-tests.factor index a519400870..9161ce33cc 100644 --- a/extra/fftw/fftw-tests.factor +++ b/extra/fftw/fftw-tests.factor @@ -1,5 +1,4 @@ USING: fftw tools.test ; -IN: fftw.tests { { C{ 1.5 0.0 } C{ -0.5 0.0 } } diff --git a/extra/fjsc/fjsc-tests.factor b/extra/fjsc/fjsc-tests.factor index 2e385ca566..226fa338a9 100644 --- a/extra/fjsc/fjsc-tests.factor +++ b/extra/fjsc/fjsc-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2006 Chris Double. All Rights Reserved. ! See http://factorcode.org/license.txt for BSD license. USING: kernel tools.test peg fjsc ; -IN: fjsc.tests { T{ ast-expression f V{ T{ ast-number f 55 } T{ ast-identifier f "2abc1" } T{ ast-number f 100 } } } } [ "55 2abc1 100" expression-parser parse diff --git a/extra/flip-text/flip-text-tests.factor b/extra/flip-text/flip-text-tests.factor index 772e53cba9..a278dfbf31 100644 --- a/extra/flip-text/flip-text-tests.factor +++ b/extra/flip-text/flip-text-tests.factor @@ -3,8 +3,6 @@ USING: flip-text tools.test ; -IN: flip-text.tests - { "068Ɫ95ᔭƐᄅ⇂zʎxʍʌnʇsɹbdouɯʃʞɾᴉɥᵷɟǝpɔqɐZ⅄XMΛՈ⊥SᴚΌԀONW⅂KᒋIH⅁ℲƎᗡϽ𐐒∀" } [ diff --git a/extra/fuel/eval/eval-tests.factor b/extra/fuel/eval/eval-tests.factor index 5e3f61ad82..346280f4f7 100644 --- a/extra/fuel/eval/eval-tests.factor +++ b/extra/fuel/eval/eval-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: continuations fuel fuel.eval io.streams.string kernel math namespaces random.data sequences tools.test vocabs.parser ; -IN: fuel.eval.tests ! pop-restarts { V{ "um" } } [ diff --git a/extra/fuel/help/help-tests.factor b/extra/fuel/help/help-tests.factor index d8a75e21a4..f2c7dc56e2 100644 --- a/extra/fuel/help/help-tests.factor +++ b/extra/fuel/help/help-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: fuel.help fuel.help.private help help.topics sequences tools.test ; -IN: fuel.help.tests { { diff --git a/extra/fuel/pprint/pprint-tests.factor b/extra/fuel/pprint/pprint-tests.factor index 3ac268ac22..adc75730b5 100644 --- a/extra/fuel/pprint/pprint-tests.factor +++ b/extra/fuel/pprint/pprint-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Jose Antonio Ortega Ruiz. ! See http://factorcode.org/license.txt for BSD license. USING: compiler.errors fuel.pprint io.streams.string tools.test ; -IN: fuel.pprint.tests { "(source-file-error nil \"hi\")" } [ [ "hi" "there" fuel-pprint ] with-string-writer diff --git a/extra/gml/gml-tests.factor b/extra/gml/gml-tests.factor index 99c099abac..2b0203b79d 100644 --- a/extra/gml/gml-tests.factor +++ b/extra/gml/gml-tests.factor @@ -1,5 +1,5 @@ -IN: gml.tests -USING: accessors combinators gml tools.test kernel sequences euler.b-rep ; +USING: accessors combinators gml tools.test kernel sequences +euler.b-rep ; { } [ [ "vocab:gml/test-core.gml" run-gml-file ] make-gml 2drop ] unit-test diff --git a/extra/gml/viewer/viewer-tests.factor b/extra/gml/viewer/viewer-tests.factor index de7c3761d0..1ec2ab7c0f 100644 --- a/extra/gml/viewer/viewer-tests.factor +++ b/extra/gml/viewer/viewer-tests.factor @@ -1,5 +1,4 @@ USING: gml.viewer math.vectors.simd.cords tools.test ; -IN: gml.viewer.tests { { double-4{ 0 0 0 0 } diff --git a/extra/google/charts/charts-tests.factor b/extra/google/charts/charts-tests.factor index efa9694bca..a62e681c17 100644 --- a/extra/google/charts/charts-tests.factor +++ b/extra/google/charts/charts-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors colors.constants google.charts google.charts.private kernel math present sequences tools.test ; -IN: google.charts.tests ! The order of the constructors below is important, because we ! are testing side-effects. If you remove the clone word from diff --git a/extra/grid-meshes/grid-meshes-tests.factor b/extra/grid-meshes/grid-meshes-tests.factor index 71743af3fd..111f887787 100644 --- a/extra/grid-meshes/grid-meshes-tests.factor +++ b/extra/grid-meshes/grid-meshes-tests.factor @@ -1,4 +1,3 @@ -IN: grid-meshes.tests USING: alien.c-types alien.data grid-meshes grid-meshes.private specialized-arrays tools.test ; SPECIALIZED-ARRAY: float diff --git a/extra/grouping/extras/extras-tests.factor b/extra/grouping/extras/extras-tests.factor index 3b8f802514..24a1a7ec8b 100644 --- a/extra/grouping/extras/extras-tests.factor +++ b/extra/grouping/extras/extras-tests.factor @@ -1,5 +1,4 @@ USING: arrays kernel math math.functions sequences tools.test ; -IN: grouping.extras { { } } [ { 1 } [ 2array ] 2clump-map ] unit-test { { { 1 2 } } } [ { 1 2 } [ 2array ] 2clump-map ] unit-test diff --git a/extra/hash-sets/numbers/numbers-tests.factor b/extra/hash-sets/numbers/numbers-tests.factor index 2f51ed7b62..4440e5675e 100644 --- a/extra/hash-sets/numbers/numbers-tests.factor +++ b/extra/hash-sets/numbers/numbers-tests.factor @@ -3,8 +3,6 @@ USING: hash-sets.numbers kernel sets tools.test ; -IN: hash-sets.numbers.tests - { t } [ 1.5 NHS{ 3/2 } in? ] unit-test { NHS{ 3/2 } } [ diff --git a/extra/hashtables/numbers/numbers-tests.factor b/extra/hashtables/numbers/numbers-tests.factor index a8f1d5a3ed..ee3eab478c 100644 --- a/extra/hashtables/numbers/numbers-tests.factor +++ b/extra/hashtables/numbers/numbers-tests.factor @@ -4,8 +4,6 @@ USING: assocs hashtables.numbers kernel literals sequences tools.test ; -IN: hashtables.numbers.tests - { 1000 } [ 3/2 NH{ { 1.5 1000 } } at ] unit-test { 1001 } [ diff --git a/extra/hello-unicode/hello-unicode-tests.factor b/extra/hello-unicode/hello-unicode-tests.factor deleted file mode 100644 index bf9d572801..0000000000 --- a/extra/hello-unicode/hello-unicode-tests.factor +++ /dev/null @@ -1,4 +0,0 @@ -! Copyright (C) 2009 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: tools.test hello-unicode ; -IN: hello-unicode.tests diff --git a/extra/html/elements/elements-tests.factor b/extra/html/elements/elements-tests.factor index c216961af7..1fc4dcd071 100644 --- a/extra/html/elements/elements-tests.factor +++ b/extra/html/elements/elements-tests.factor @@ -1,4 +1,3 @@ -IN: html.elements.tests USING: tools.test html.elements io.streams.string ; { "" } diff --git a/extra/html/parser/analyzer/analyzer-tests.factor b/extra/html/parser/analyzer/analyzer-tests.factor index 0c640354fd..d4098092c2 100644 --- a/extra/html/parser/analyzer/analyzer-tests.factor +++ b/extra/html/parser/analyzer/analyzer-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: html.parser html.parser.analyzer kernel math sequences tools.test ; -IN: html.parser.analyzer.tests { 0 3 } [ 1 { 3 5 7 9 11 } [ odd? ] find-nth ] unit-test diff --git a/extra/html/parser/parser-tests.factor b/extra/html/parser/parser-tests.factor index b235448c70..45cad8841d 100644 --- a/extra/html/parser/parser-tests.factor +++ b/extra/html/parser/parser-tests.factor @@ -1,5 +1,4 @@ USING: html.parser kernel tools.test ; -IN: html.parser.tests { V{ T{ tag f "html" H{ } f f } } diff --git a/extra/html/parser/printer/printer-tests.factor b/extra/html/parser/printer/printer-tests.factor index a2a049f277..dd07363955 100644 --- a/extra/html/parser/printer/printer-tests.factor +++ b/extra/html/parser/printer/printer-tests.factor @@ -1,10 +1,5 @@ -USING: - html.parser html.parser.printer - io.streams.string - namespaces - strings - tools.test ; -IN: html.parser.printer.tests +USING: html.parser html.parser.printer io.streams.string +namespaces strings tools.test ; { " " diff --git a/extra/html/parser/utils/utils-tests.factor b/extra/html/parser/utils/utils-tests.factor index 3acaa63edf..e5195a4d31 100644 --- a/extra/html/parser/utils/utils-tests.factor +++ b/extra/html/parser/utils/utils-tests.factor @@ -1,8 +1,4 @@ -USING: assocs combinators continuations hashtables -hashtables.private io kernel math -namespaces prettyprint quotations sequences splitting -strings tools.test html.parser.utils quoting ; -IN: html.parser.utils.tests +USING: html.parser.utils quoting tools.test ; { "'Rome'" } [ "Rome" single-quote ] unit-test { "\"Roma\"" } [ "Roma" double-quote ] unit-test diff --git a/extra/images/bitmap/bitmap-tests.factor b/extra/images/bitmap/bitmap-tests.factor index 5a97911bc4..3fc1f451a1 100644 --- a/extra/images/bitmap/bitmap-tests.factor +++ b/extra/images/bitmap/bitmap-tests.factor @@ -1,5 +1,4 @@ USING: images.bitmap images.testing kernel sequences ; -IN: images.bitmap.tests ! "vocab:images/testing/bmp/1bit.bmp" bmp-image decode-test ! "vocab:images/testing/bmp/rgb_4bit.bmp" bmp-image decode-test diff --git a/extra/images/pbm/pbm-tests.factor b/extra/images/pbm/pbm-tests.factor index 4568fbdf18..da9c63766f 100644 --- a/extra/images/pbm/pbm-tests.factor +++ b/extra/images/pbm/pbm-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. USING: images.pbm images.testing sequences ; -IN: images.pbm.tests { "vocab:images/testing/pbm/test.binary.pbm" diff --git a/extra/images/pgm/pgm-tests.factor b/extra/images/pgm/pgm-tests.factor index 83eb244d8a..ecf2dc2721 100644 --- a/extra/images/pgm/pgm-tests.factor +++ b/extra/images/pgm/pgm-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. USING: images.testing images.pgm sequences ; -IN: images.pgm.tests { "vocab:images/testing/pgm/radial.binary.pgm" diff --git a/extra/images/png/png-tests.factor b/extra/images/png/png-tests.factor index df156c8f78..b2dc45b737 100644 --- a/extra/images/png/png-tests.factor +++ b/extra/images/png/png-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors images.png images.testing io.directories io.encodings.binary io.files kernel sequences tools.test ; -IN: images.png.tests ! Test files from PngSuite (http://www.libpng.org/pub/png/pngsuite.html) diff --git a/extra/images/ppm/ppm-tests.factor b/extra/images/ppm/ppm-tests.factor index c8757dc286..d998fcd8fe 100644 --- a/extra/images/ppm/ppm-tests.factor +++ b/extra/images/ppm/ppm-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. USING: images.testing images.ppm sequences ; -IN: images.ppm.tests { "vocab:images/testing/ppm/binary.ppm" diff --git a/extra/images/tiff/tiff-tests.factor b/extra/images/tiff/tiff-tests.factor index 7c9193df9a..7181e099a3 100644 --- a/extra/images/tiff/tiff-tests.factor +++ b/extra/images/tiff/tiff-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: images.testing images.tiff sequences ; -IN: images.tiff.tests { "vocab:images/testing/tiff/octagon.tiff" diff --git a/extra/ini-file/ini-file-tests.factor b/extra/ini-file/ini-file-tests.factor index 2878bf6fa6..7f9108e775 100644 --- a/extra/ini-file/ini-file-tests.factor +++ b/extra/ini-file/ini-file-tests.factor @@ -3,8 +3,6 @@ USING: ini-file tools.test ; -IN: ini-file.tests - { H{ } } [ "" string>ini ] unit-test { H{ { "section" H{ } } } } [ "[section]" string>ini ] unit-test diff --git a/extra/io/binary/fast/fast-tests.factor b/extra/io/binary/fast/fast-tests.factor index 88386bb61a..66c98b0876 100644 --- a/extra/io/binary/fast/fast-tests.factor +++ b/extra/io/binary/fast/fast-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2011 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test io.binary.fast ; -IN: io.binary.fast.tests { 0x0102 } [ B{ 01 02 } 2be> ] unit-test { 0x01020304 } [ B{ 01 02 03 04 } 4be> ] unit-test diff --git a/extra/io/encodings/detect/detect-tests.factor b/extra/io/encodings/detect/detect-tests.factor index c622c587c8..6a5e02abf6 100644 --- a/extra/io/encodings/detect/detect-tests.factor +++ b/extra/io/encodings/detect/detect-tests.factor @@ -4,7 +4,6 @@ USING: byte-arrays io.encodings.8-bit.koi8-r io.encodings.8-bit.latin1 io.encodings.binary io.encodings.detect io.encodings.utf16 io.encodings.utf32 io.encodings.utf8 namespaces tools.test ; -IN: io.encodings.detect.tests ! UTF encodings with BOMs { utf16be } [ B{ 0xFE 0xFF 0x00 0x31 0x00 0x32 0x00 0x33 } detect-byte-array ] unit-test diff --git a/extra/io/streams/peek/peek-tests.factor b/extra/io/streams/peek/peek-tests.factor index 05376137ff..7e6dcf0f7f 100644 --- a/extra/io/streams/peek/peek-tests.factor +++ b/extra/io/streams/peek/peek-tests.factor @@ -4,7 +4,6 @@ USING: byte-arrays destructors io io.encodings.ascii io.encodings.binary io.files io.streams.byte-array io.streams.memory io.streams.peek io.streams.string kernel make namespaces sequences strings tools.test ; -IN: io.streams.peek.tests { CHAR: a } [ "abc" stream-read1 ] unit-test diff --git a/extra/irc/messages/messages-tests.factor b/extra/irc/messages/messages-tests.factor index 14e53b281e..2fbc3c59db 100644 --- a/extra/irc/messages/messages-tests.factor +++ b/extra/irc/messages/messages-tests.factor @@ -1,8 +1,6 @@ ! Copyright (C) 2009 Bruno Deferrari ! See http://factorcode.org/license.txt for BSD license. USING: accessors irc.messages irc.messages.parser tools.test ; -IN: irc.messages.tests - ! { "someuser" } [ "someuser!n=user@some.where" parse-name ] unit-test diff --git a/extra/jamshred/oint/oint-tests.factor b/extra/jamshred/oint/oint-tests.factor index 3b52e4b1b6..7abddcc71a 100644 --- a/extra/jamshred/oint/oint-tests.factor +++ b/extra/jamshred/oint/oint-tests.factor @@ -1,5 +1,4 @@ USING: jamshred.oint tools.test ; -IN: jamshred.oint.tests { { 0 -1 -1 } } [ { 0 1 -1 } { 0 -1 0 } reflect ] unit-test { { 0 1 0 } } [ { 1 1 0 } { 1 0 0 } proj-perp ] unit-test diff --git a/extra/literate/literate-tests.factor b/extra/literate/literate-tests.factor index 448e68c2dd..f08e170ed6 100644 --- a/extra/literate/literate-tests.factor +++ b/extra/literate/literate-tests.factor @@ -1,5 +1,4 @@ -USING: eval kernel math tools.test ; -IN: literate +USING: eval kernel literate math tools.test ; { 2 3 t } [ { 1 2 6 4 2 } over fit-y diff --git a/extra/machine-learning/label-encoder/label-encoder-tests.factor b/extra/machine-learning/label-encoder/label-encoder-tests.factor index 235bb48af5..b7994e78c8 100644 --- a/extra/machine-learning/label-encoder/label-encoder-tests.factor +++ b/extra/machine-learning/label-encoder/label-encoder-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel machine-learning.label-encoder machine-learning.transformer tools.test ; -IN: machine-learning.label-encoder.tests { { 1 3 2 4 } } [ { 1 2 3 4 3 2 3 2 2 3 2 } over fit-y diff --git a/extra/machine-learning/rebalancing/rebalancing-tests.factor b/extra/machine-learning/rebalancing/rebalancing-tests.factor index 89a796c583..86f350a912 100644 --- a/extra/machine-learning/rebalancing/rebalancing-tests.factor +++ b/extra/machine-learning/rebalancing/rebalancing-tests.factor @@ -3,7 +3,6 @@ USING: assocs kernel machine-learning.rebalancing math math.statistics math.text.english sequences tools.test math.vectors ; -IN: machine-learning.rebalancing.tests { t } [ { 1 1 1 2 } [ [ number>text ] map ] [ ] bi diff --git a/extra/magic/magic-tests.factor b/extra/magic/magic-tests.factor index 78d01cb072..e9d514d91c 100644 --- a/extra/magic/magic-tests.factor +++ b/extra/magic/magic-tests.factor @@ -1,5 +1,4 @@ USING: magic system tools.test ; -IN: magic.tests { "data" } [ image-path guess-file ] unit-test { "application/octet-stream" } [ image-path guess-mime-type ] unit-test diff --git a/extra/mason/child/child-tests.factor b/extra/mason/child/child-tests.factor index f2e99714ab..67b0d21a75 100644 --- a/extra/mason/child/child-tests.factor +++ b/extra/mason/child/child-tests.factor @@ -1,6 +1,5 @@ USING: io io.pathnames kernel mason.child mason.config namespaces sequences system tools.test ; -IN: mason.child.tests { t } [ H{ diff --git a/extra/mason/common/common-tests.factor b/extra/mason/common/common-tests.factor index e1b1aee1c4..e51c6e59a3 100644 --- a/extra/mason/common/common-tests.factor +++ b/extra/mason/common/common-tests.factor @@ -1,7 +1,5 @@ -IN: mason.common.tests -USING: prettyprint mason.common mason.config -namespaces calendar tools.test io.files -io.files.temp io.encodings.utf8 sequences ; +USING: prettyprint mason.common mason.config namespaces calendar +tools.test io.files io.files.temp io.encodings.utf8 sequences ; { "00:01:02" } [ 62,000,000,000 nanos>time ] unit-test diff --git a/extra/mason/disk/disk-tests.factor b/extra/mason/disk/disk-tests.factor index 6ebed55fad..256f9272fd 100644 --- a/extra/mason/disk/disk-tests.factor +++ b/extra/mason/disk/disk-tests.factor @@ -1,6 +1,5 @@ USING: mason.config mason.disk namespaces io.directories io.files.temp tools.test strings sequences ; -IN: mason.disk.tests "builds" temp-file builds-dir [ builds-dir get make-directories diff --git a/extra/mason/email/email-tests.factor b/extra/mason/email/email-tests.factor index 26e5afd511..60b26420f7 100644 --- a/extra/mason/email/email-tests.factor +++ b/extra/mason/email/email-tests.factor @@ -1,4 +1,3 @@ -IN: mason.email.tests USING: mason.email mason.common mason.config namespaces tools.test system ; diff --git a/extra/mason/platform/platform-tests.factor b/extra/mason/platform/platform-tests.factor index dc76bdad4e..32a18025ba 100644 --- a/extra/mason/platform/platform-tests.factor +++ b/extra/mason/platform/platform-tests.factor @@ -1,21 +1,20 @@ USING: mason.config mason.platform namespaces tools.test strings system ; -IN: mason.platform.tests { t } [ platform string? ] unit-test -[ - linux target-os set - x86.32 target-cpu set - f target-variant set +{ "linux-x86-32" } [ + H{ + { target-os linux } + { target-cpu x86.32 } + { target-variant f } + } [ platform ] with-variables +] unit-test - [ "linux-x86-32" ] [ platform ] unit-test -] with-scope - -[ - windows target-os set - x86.32 target-cpu set - "xp" target-variant set - - [ "windows-x86-32-xp" ] [ platform ] unit-test -] with-scope +{ "windows-x86-32-xp" } [ + H{ + { target-os windows } + { target-cpu x86.32 } + { target-variant "xp" } + } [ platform ] with-variables +] unit-test diff --git a/extra/mason/release/archive/archive-tests.factor b/extra/mason/release/archive/archive-tests.factor index 16be1522cf..4ee1b595f2 100644 --- a/extra/mason/release/archive/archive-tests.factor +++ b/extra/mason/release/archive/archive-tests.factor @@ -1,6 +1,4 @@ -USING: system tools.test ; - -IN: mason.release.archive +USING: mason.release.archive system tools.test ; { ".dmg" } [ macosx extension ] unit-test { ".dmg" } [ "macosx" extension ] unit-test diff --git a/extra/mason/release/branch/branch-tests.factor b/extra/mason/release/branch/branch-tests.factor index fb3df6c50d..39827c20d9 100644 --- a/extra/mason/release/branch/branch-tests.factor +++ b/extra/mason/release/branch/branch-tests.factor @@ -1,4 +1,3 @@ -IN: mason.release.branch.tests USING: mason.release.branch mason.config tools.test namespaces system ; diff --git a/extra/mason/release/upload/upload-tests.factor b/extra/mason/release/upload/upload-tests.factor deleted file mode 100644 index 9a0185ee7f..0000000000 --- a/extra/mason/release/upload/upload-tests.factor +++ /dev/null @@ -1,2 +0,0 @@ -IN: mason.release.upload.tests -USING: mason.release.upload tools.test ; diff --git a/extra/math/affine-transforms/affine-transforms-tests.factor b/extra/math/affine-transforms/affine-transforms-tests.factor index ae36ad7f2c..e1b7deecc7 100644 --- a/extra/math/affine-transforms/affine-transforms-tests.factor +++ b/extra/math/affine-transforms/affine-transforms-tests.factor @@ -1,7 +1,6 @@ ! (c)2009 Joe Groff, see BSD license USING: arrays kernel literals tools.test math math.affine-transforms math.constants math.functions ; -IN: math.affine-transforms.tests { { 7.25 4.25 } } [ { 0.75 0.75 } { 0.75 -0.75 } { 5.0 5.0 } diff --git a/extra/math/approx/approx-tests.factor b/extra/math/approx/approx-tests.factor index 23ad5b73b3..9cd3f79f49 100644 --- a/extra/math/approx/approx-tests.factor +++ b/extra/math/approx/approx-tests.factor @@ -4,8 +4,6 @@ USING: kernel math math.approx math.constants math.floating-point sequences tools.test ; -IN: math.approx.tests - { { 3 3 13/4 16/5 19/6 22/7 } } [ pi double>ratio diff --git a/extra/math/binpack/binpack-tests.factor b/extra/math/binpack/binpack-tests.factor index d28eff031f..032ca8d86d 100644 --- a/extra/math/binpack/binpack-tests.factor +++ b/extra/math/binpack/binpack-tests.factor @@ -3,8 +3,6 @@ USING: kernel tools.test sequences ; -IN: math.binpack - { { V{ } } } [ { } 1 binpack ] unit-test { { V{ 3 } V{ 2 1 } } } [ { 1 2 3 } 2 binpack ] unit-test diff --git a/extra/math/blas/matrices/matrices-tests.factor b/extra/math/blas/matrices/matrices-tests.factor index 5a7345d682..edb331d641 100644 --- a/extra/math/blas/matrices/matrices-tests.factor +++ b/extra/math/blas/matrices/matrices-tests.factor @@ -1,6 +1,5 @@ USING: kernel math.blas.matrices math.blas.vectors sequences tools.test ; -IN: math.blas.matrices.tests ! clone diff --git a/extra/math/blas/vectors/vectors-tests.factor b/extra/math/blas/vectors/vectors-tests.factor index e566a46f5d..a4e1d19613 100644 --- a/extra/math/blas/vectors/vectors-tests.factor +++ b/extra/math/blas/vectors/vectors-tests.factor @@ -1,5 +1,4 @@ USING: kernel math.blas.vectors math.functions sequences tools.test ; -IN: math.blas.vectors.tests ! clone diff --git a/extra/math/combinatorics/bits/bits-tests.factor b/extra/math/combinatorics/bits/bits-tests.factor index 19afbaedfd..f213d29a75 100644 --- a/extra/math/combinatorics/bits/bits-tests.factor +++ b/extra/math/combinatorics/bits/bits-tests.factor @@ -1,5 +1,4 @@ -USING: math tools.test ; -IN: math.combinatorics.bits +USING: math math.combinatorics.bits tools.test ; { 0b101 } [ 0b011 next-permutation-bits ] unit-test { 0b110 } [ 0b101 next-permutation-bits ] unit-test diff --git a/extra/math/combinators/combinators-tests.factor b/extra/math/combinators/combinators-tests.factor index eb6ad7f21f..288e1b7209 100644 --- a/extra/math/combinators/combinators-tests.factor +++ b/extra/math/combinators/combinators-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2013 Loryn Jenkins. ! See http://factorcode.org/license.txt for BSD license. USING: kernel math math.combinators tools.test ; -IN: math.combinators.tests { 0 } [ -3 [ drop 0 ] when-negative ] unit-test { -2 } [ -3 [ 1 + ] when-negative ] unit-test diff --git a/extra/math/compare/compare-tests.factor b/extra/math/compare/compare-tests.factor index 20b98a7f34..9ddd4aad89 100644 --- a/extra/math/compare/compare-tests.factor +++ b/extra/math/compare/compare-tests.factor @@ -1,8 +1,6 @@ USING: kernel math math.compare math.functions sequences tools.test ; -IN: math.compare.tests - { -1 } [ -1 5 absmin ] unit-test { -1 } [ -1 -5 absmin ] unit-test diff --git a/extra/math/distances/distances-tests.factor b/extra/math/distances/distances-tests.factor index 5e1f0015c0..f9ea5966bb 100644 --- a/extra/math/distances/distances-tests.factor +++ b/extra/math/distances/distances-tests.factor @@ -3,8 +3,6 @@ USING: kernel math.distances math.functions tools.test ; -IN: math.distances.tests - { 1 } [ "hello" "jello" hamming-distance ] unit-test { 0.0 } [ { 1 2 3 } dup cosine-distance ] unit-test diff --git a/extra/math/dual/dual-tests.factor b/extra/math/dual/dual-tests.factor index 055c44cd09..3451dcd50d 100644 --- a/extra/math/dual/dual-tests.factor +++ b/extra/math/dual/dual-tests.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2009 Jason W. Merrill. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test math.dual kernel accessors math math.functions - math.constants ; -IN: math.dual.tests +math.constants ; { 0.0 1.0 } [ 0 1 dsin unpack-dual ] unit-test { 1.0 0.0 } [ 0 1 dcos unpack-dual ] unit-test diff --git a/extra/math/extras/extras-tests.factor b/extra/math/extras/extras-tests.factor index 4b4fb91e3e..b87e95c01a 100644 --- a/extra/math/extras/extras-tests.factor +++ b/extra/math/extras/extras-tests.factor @@ -4,8 +4,6 @@ USING: arrays kernel math math.extras math.ranges sequences tools.test ; -IN: math.extras.tests - { { 1 -1/2 1/6 0 -1/30 0 1/42 0 -1/30 0 } } [ 10 [ bernoulli ] map ] unit-test diff --git a/extra/math/factorials/factorials-tests.factor b/extra/math/factorials/factorials-tests.factor index 039a42c25d..dcfea2f5d1 100644 --- a/extra/math/factorials/factorials-tests.factor +++ b/extra/math/factorials/factorials-tests.factor @@ -1,5 +1,4 @@ -USING: kernel math.functions math.ranges sequences tools.test ; -IN: math.factorials +USING: kernel math.factorials math.functions math.ranges sequences tools.test ; { 1 } [ -1 factorial ] unit-test ! not necessarily correct { 1 } [ 0 factorial ] unit-test diff --git a/extra/math/finance/finance-tests.factor b/extra/math/finance/finance-tests.factor index ed2d4cae34..0a28581399 100644 --- a/extra/math/finance/finance-tests.factor +++ b/extra/math/finance/finance-tests.factor @@ -1,8 +1,6 @@ USING: kernel math math.functions math.finance sequences tools.test ; -IN: math.finance.tests - { { 1 2 3 4 5 } } [ { 1 2 3 4 5 } 1 ema ] unit-test { { 1+1/2 2+1/2 3+1/2 4+1/2 } } [ { 1 2 3 4 5 } 2 ema ] unit-test { { 2 3 4 } } [ { 1 2 3 4 5 } 3 ema ] unit-test diff --git a/extra/math/hashcodes/hashcodes-tests.factor b/extra/math/hashcodes/hashcodes-tests.factor index 5d3573c445..e1a55e3551 100644 --- a/extra/math/hashcodes/hashcodes-tests.factor +++ b/extra/math/hashcodes/hashcodes-tests.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: arrays kernel grouping math sequences tools.test ; - -IN: math.hashcodes +USING: arrays kernel grouping math math.hashcodes sequences +tools.test ; { t } [ 12 dup >bignum 12.0 12 0 complex boa 4array diff --git a/extra/math/matrices/laplace/laplace-tests.factor b/extra/math/matrices/laplace/laplace-tests.factor index e1c3a7f70a..eab1e6f9be 100644 --- a/extra/math/matrices/laplace/laplace-tests.factor +++ b/extra/math/matrices/laplace/laplace-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2013 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: tools.test kernel ; -IN: math.matrices.laplace +USING: math.matrices.laplace tools.test kernel ; { -2 } [ { { 1 2 } { 3 4 } } determinant ] unit-test diff --git a/extra/math/matrices/simd/simd-tests.factor b/extra/math/matrices/simd/simd-tests.factor index f9370941ac..8b4c948e4d 100644 --- a/extra/math/matrices/simd/simd-tests.factor +++ b/extra/math/matrices/simd/simd-tests.factor @@ -5,7 +5,6 @@ literals math.constants math.functions specialized-arrays tools.test ; QUALIFIED-WITH: alien.c-types c FROM: math.matrices => m~ ; SPECIALIZED-ARRAY: float-4 -IN: math.matrices.simd.tests { S{ matrix4 f diff --git a/extra/math/numerical-integration/numerical-integration-tests.factor b/extra/math/numerical-integration/numerical-integration-tests.factor index 7b803f7d4b..bd4d36b59d 100644 --- a/extra/math/numerical-integration/numerical-integration-tests.factor +++ b/extra/math/numerical-integration/numerical-integration-tests.factor @@ -1,6 +1,5 @@ USING: kernel math.numerical-integration tools.test math math.constants math.functions ; -IN: math.numerical-integration.tests { 50 } [ 0 10 [ ] integrate-simpson ] unit-test { 1000/3 } [ 0 10 [ sq ] integrate-simpson ] unit-test diff --git a/extra/math/primes/solovay-strassen/solovay-strassen-tests.factor b/extra/math/primes/solovay-strassen/solovay-strassen-tests.factor index 9801fc80f3..695df447d6 100644 --- a/extra/math/primes/solovay-strassen/solovay-strassen-tests.factor +++ b/extra/math/primes/solovay-strassen/solovay-strassen-tests.factor @@ -1,5 +1,5 @@ -USING: kernel math.primes sequences tools.test ; -IN: math.primes.solovay-strassen +USING: kernel math.primes math.primes.solovay-strassen sequences +tools.test ; { t } [ 100,000 [ solovay-strassen ] filter diff --git a/extra/math/primes/twins/twins-tests.factor b/extra/math/primes/twins/twins-tests.factor index 2ecfdb203b..a217cfae6d 100644 --- a/extra/math/primes/twins/twins-tests.factor +++ b/extra/math/primes/twins/twins-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license USING: math.primes.twins tools.test ; -IN: math.primes.twins.tests { { } } [ 3 twin-primes-upto ] unit-test { { V{ 3 5 } V{ 5 7 } V{ 11 13 } } } [ 13 twin-primes-upto ] unit-test diff --git a/extra/math/text/english/english-tests.factor b/extra/math/text/english/english-tests.factor index 2829b37a56..53e33cdc79 100644 --- a/extra/math/text/english/english-tests.factor +++ b/extra/math/text/english/english-tests.factor @@ -1,5 +1,4 @@ USING: math.functions math.text.english tools.test ; -IN: math.text.english.tests { "zero" } [ 0 number>text ] unit-test { "twenty-one" } [ 21 number>text ] unit-test diff --git a/extra/math/text/utils/utils-tests.factor b/extra/math/text/utils/utils-tests.factor index e05e4e5499..78500ef764 100644 --- a/extra/math/text/utils/utils-tests.factor +++ b/extra/math/text/utils/utils-tests.factor @@ -1,4 +1,3 @@ USING: math.text.utils tools.test ; -IN: math.text.utils.tests { { 1 999 2 } } [ 2999001 3 digit-groups ] unit-test diff --git a/extra/math/transforms/bwt/bwt-tests.factor b/extra/math/transforms/bwt/bwt-tests.factor index 6c58161ef4..d851d1a50e 100644 --- a/extra/math/transforms/bwt/bwt-tests.factor +++ b/extra/math/transforms/bwt/bwt-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license USING: math.transforms.bwt tools.test ; -IN: math.transforms.bwt.tests { "asdf" } [ "asdf" bwt ibwt ] unit-test diff --git a/extra/math/transforms/fft/fft-tests.factor b/extra/math/transforms/fft/fft-tests.factor index 8435adc3e3..c09a87040a 100644 --- a/extra/math/transforms/fft/fft-tests.factor +++ b/extra/math/transforms/fft/fft-tests.factor @@ -1,5 +1,4 @@ -USING: math.vectors tools.test ; -IN: math.transforms.fft +USING: math.transforms.fft math.vectors tools.test ; ! even lengths diff --git a/extra/math/transforms/haar/haar-tests.factor b/extra/math/transforms/haar/haar-tests.factor index 1b38472a64..6cb8b398fb 100644 --- a/extra/math/transforms/haar/haar-tests.factor +++ b/extra/math/transforms/haar/haar-tests.factor @@ -1,5 +1,4 @@ USING: math.transforms.haar tools.test ; -IN: math.transforms.haar.tests { { 3 2 -1 -2 3 0 4 1 } } [ { 7 1 6 6 3 -5 4 2 } haar ] unit-test { { 7 1 6 6 3 -5 4 2 } } [ { 3 2 -1 -2 3 0 4 1 } rev-haar ] unit-test diff --git a/extra/math/vectors/homogeneous/homogeneous-tests.factor b/extra/math/vectors/homogeneous/homogeneous-tests.factor index 62236b2959..087d12adb8 100644 --- a/extra/math/vectors/homogeneous/homogeneous-tests.factor +++ b/extra/math/vectors/homogeneous/homogeneous-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. USING: math.vectors.homogeneous tools.test ; -IN: math.vectors.homogeneous.tests { { 1.0 2.0 1.0 } } [ { 1.0 0.0 1.0 } { 0.0 2.0 1.0 } h+ ] unit-test { { 1.0 -2.0 1.0 } } [ { 1.0 0.0 1.0 } { 0.0 2.0 1.0 } h- ] unit-test diff --git a/extra/memory/piles/piles-tests.factor b/extra/memory/piles/piles-tests.factor index 9f979b631a..3caa9e5424 100644 --- a/extra/memory/piles/piles-tests.factor +++ b/extra/memory/piles/piles-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien destructors kernel math memory.piles tools.test ; -IN: memory.piles.tests { 25 } [ [ diff --git a/extra/metar/metar-tests.factor b/extra/metar/metar-tests.factor index 35f7bbe776..c32435dbc3 100644 --- a/extra/metar/metar-tests.factor +++ b/extra/metar/metar-tests.factor @@ -1,5 +1,4 @@ USING: metar.private tools.test ; -IN: metar.tests { { "RAB05" "E30" "SNB20" "E55" } } [ "RAB05E30SNB20E55" split-recent-weather ] unit-test diff --git a/extra/midi/midi-tests.factor b/extra/midi/midi-tests.factor index 3e19cf0da4..bd290cbb4c 100644 --- a/extra/midi/midi-tests.factor +++ b/extra/midi/midi-tests.factor @@ -1,6 +1,5 @@ USING: io.encodings.binary io.streams.byte-array midi midi.private sequences tools.test ; -IN: midi.tests ! variable-width numbers { diff --git a/extra/models/history/history-tests.factor b/extra/models/history/history-tests.factor index 16efac9d8c..a5c3089a6d 100644 --- a/extra/models/history/history-tests.factor +++ b/extra/models/history/history-tests.factor @@ -1,6 +1,5 @@ USING: arrays generic kernel math models namespaces sequences assocs tools.test models.history accessors ; -IN: models.history.tests f "history" set diff --git a/extra/money/money-tests.factor b/extra/money/money-tests.factor index 786b4828a9..972ff5e65c 100644 --- a/extra/money/money-tests.factor +++ b/extra/money/money-tests.factor @@ -1,5 +1,4 @@ USING: money parser tools.test eval ; -IN: money.tests { -1/10 } [ DECIMAL: -.1 ] unit-test { -1/10 } [ DECIMAL: -0.1 ] unit-test diff --git a/extra/morse/morse-tests.factor b/extra/morse/morse-tests.factor index 95b837a9eb..da853845b0 100644 --- a/extra/morse/morse-tests.factor +++ b/extra/morse/morse-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2007 Alex Chapman ! See http://factorcode.org/license.txt for BSD license. USING: arrays morse strings tools.test ; -IN: morse.tests { "?" } [ CHAR: \\ ch>morse ] unit-test { "..." } [ CHAR: s ch>morse ] unit-test diff --git a/extra/msgpack/msgpack-tests.factor b/extra/msgpack/msgpack-tests.factor index 9fe57b32d9..1efd0b30ca 100644 --- a/extra/msgpack/msgpack-tests.factor +++ b/extra/msgpack/msgpack-tests.factor @@ -1,6 +1,5 @@ -USING: io.streams.string kernel math sequences tools.test ; - -IN: msgpack +USING: io.streams.string kernel math msgpack sequences +tools.test ; { { diff --git a/extra/msxml-to-csv/msxml-to-csv-tests.factor b/extra/msxml-to-csv/msxml-to-csv-tests.factor index 1f3b35ade1..8f0593c555 100644 --- a/extra/msxml-to-csv/msxml-to-csv-tests.factor +++ b/extra/msxml-to-csv/msxml-to-csv-tests.factor @@ -1,4 +1,3 @@ -IN: msxml-to-csv.tests USING: msxml-to-csv tools.test csv io.encodings.utf8 io.files.temp kernel ; diff --git a/extra/noise/noise-tests.factor b/extra/noise/noise-tests.factor index a9438f3cbc..536d8f4593 100644 --- a/extra/noise/noise-tests.factor +++ b/extra/noise/noise-tests.factor @@ -1,4 +1,3 @@ -IN: noise.tests USING: noise tools.test sequences math ; { t } [ { 100 100 } perlin-noise-map-coords [ [ 100 <= ] all? ] all? ] unit-test diff --git a/extra/oauth1/oauth1-tests.factor b/extra/oauth1/oauth1-tests.factor index 49a0c17e36..4088cb08bf 100644 --- a/extra/oauth1/oauth1-tests.factor +++ b/extra/oauth1/oauth1-tests.factor @@ -1,6 +1,5 @@ USING: oauth1 oauth1.private tools.test accessors kernel assocs strings namespaces urls ; -IN: oauth1.tests { "%26&b" } [ "&" "b" hmac-key ] unit-test { "%26&" } [ "&" f hmac-key ] unit-test diff --git a/extra/oauth2/oauth2-tests.factor b/extra/oauth2/oauth2-tests.factor index ff0c5d5975..5d15e5b4e5 100644 --- a/extra/oauth2/oauth2-tests.factor +++ b/extra/oauth2/oauth2-tests.factor @@ -1,5 +1,4 @@ USING: accessors calendar kernel oauth2 tools.test urls ; -IN: oauth2.tests ! assoc>tokens { diff --git a/extra/pair-rocket/pair-rocket-tests.factor b/extra/pair-rocket/pair-rocket-tests.factor index a5a25f598e..9ca2c3bae8 100644 --- a/extra/pair-rocket/pair-rocket-tests.factor +++ b/extra/pair-rocket/pair-rocket-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. USING: kernel pair-rocket tools.test ; -IN: pair-rocket.tests { { "a" 1 } } [ "a" => 1 ] unit-test { { { "a" } { 1 } } } [ { "a" } => { 1 } ] unit-test diff --git a/extra/parser-combinators/parser-combinators-tests.factor b/extra/parser-combinators/parser-combinators-tests.factor index fac52bab71..a8a878c18b 100644 --- a/extra/parser-combinators/parser-combinators-tests.factor +++ b/extra/parser-combinators/parser-combinators-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel lists lists.lazy tools.test strings math sequences parser-combinators arrays math.parser unicode ; -IN: parser-combinators.tests ! Testing <&> { { T{ parse-result f { "a" "b" } T{ slice f 2 4 "abcd" } } } } [ diff --git a/extra/pdf/pdf-tests.factor b/extra/pdf/pdf-tests.factor deleted file mode 100644 index 3d4023e46a..0000000000 --- a/extra/pdf/pdf-tests.factor +++ /dev/null @@ -1,6 +0,0 @@ -! Copyright (C) 2010 John Benediktsson -! See http://factorcode.org/license.txt for BSD license - -USING: pdf tools.test ; - -IN: pdf.tests diff --git a/extra/pdf/units/units-tests.factor b/extra/pdf/units/units-tests.factor index ca00082c42..936e5b7c28 100644 --- a/extra/pdf/units/units-tests.factor +++ b/extra/pdf/units/units-tests.factor @@ -3,8 +3,6 @@ USING: pdf.units tools.test ; -IN: pdf.units.tests - { 0 } [ "0" string>points ] unit-test { 1 } [ "1" string>points ] unit-test { 1.5 } [ "1.5" string>points ] unit-test diff --git a/extra/pdf/wrap/wrap-tests.factor b/extra/pdf/wrap/wrap-tests.factor index 3019105b5d..981892d17e 100644 --- a/extra/pdf/wrap/wrap-tests.factor +++ b/extra/pdf/wrap/wrap-tests.factor @@ -1,5 +1,4 @@ USING: fonts pdf.wrap tools.test ; -IN: pdf.wrap.tests { "hello, " "extra spaces" } [ "hello, extra spaces" word-split1 diff --git a/extra/peg/javascript/javascript-tests.factor b/extra/peg/javascript/javascript-tests.factor index ce5827ab13..5fa2b91fc7 100644 --- a/extra/peg/javascript/javascript-tests.factor +++ b/extra/peg/javascript/javascript-tests.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2008 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -! -USING: kernel tools.test peg.javascript peg.javascript.ast accessors ; -IN: peg.javascript.tests + +USING: kernel tools.test peg.javascript peg.javascript.ast ; { T{ ast-begin f V{ T{ ast-number f 123 } } } } [ "123;" parse-javascript diff --git a/extra/peg/javascript/parser/parser-tests.factor b/extra/peg/javascript/parser/parser-tests.factor index 317665910b..7bde0292be 100644 --- a/extra/peg/javascript/parser/parser-tests.factor +++ b/extra/peg/javascript/parser/parser-tests.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2008 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -! -USING: kernel tools.test peg peg.javascript.ast peg.javascript.parser - accessors sequences math peg.ebnf peg.ebnf.private ; -IN: peg.javascript.parser.tests + +USING: kernel tools.test peg peg.javascript.ast +peg.javascript.parser accessors sequences math peg.ebnf +peg.ebnf.private ; { T{ diff --git a/extra/peg/javascript/tokenizer/tokenizer-tests.factor b/extra/peg/javascript/tokenizer/tokenizer-tests.factor index 5d01d2d154..4490702474 100644 --- a/extra/peg/javascript/tokenizer/tokenizer-tests.factor +++ b/extra/peg/javascript/tokenizer/tokenizer-tests.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2008 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -! -USING: kernel tools.test peg peg.javascript.ast peg.javascript.tokenizer accessors ; -IN: peg.javascript.tokenizer.tests + +USING: kernel tools.test peg peg.javascript.ast +peg.javascript.tokenizer accessors ; { V{ diff --git a/extra/peg/pl0/pl0-tests.factor b/extra/peg/pl0/pl0-tests.factor index 63415a4b24..8bbb62bf07 100644 --- a/extra/peg/pl0/pl0-tests.factor +++ b/extra/peg/pl0/pl0-tests.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -! + USING: kernel tools.test peg peg.ebnf peg.ebnf.private peg.pl0 - sequences accessors ; -IN: peg.pl0.tests +sequences accessors ; { t } [ "CONST foo = 1;" "block" \ pl0 rule (parse) remaining>> empty? diff --git a/extra/poker/poker-tests.factor b/extra/poker/poker-tests.factor index d3f8a6c438..30969e0f58 100644 --- a/extra/poker/poker-tests.factor +++ b/extra/poker/poker-tests.factor @@ -1,5 +1,5 @@ -USING: accessors kernel math math.order poker poker.private tools.test ; -IN: poker.tests +USING: accessors kernel math math.order poker poker.private +tools.test ; { 134236965 } [ "KD" >ckf ] unit-test { 529159 } [ "5s" >ckf ] unit-test diff --git a/extra/pop3/pop3-tests.factor b/extra/pop3/pop3-tests.factor index c2a1ed36b4..cc4018e0b8 100644 --- a/extra/pop3/pop3-tests.factor +++ b/extra/pop3/pop3-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: concurrency.promises namespaces kernel pop3 pop3.server sequences tools.test accessors calendar ; -IN: pop3.tests FROM: pop3 => count delete ; diff --git a/extra/rpn/rpn-tests.factor b/extra/rpn/rpn-tests.factor index 15bbf24303..1dd487bf6d 100644 --- a/extra/rpn/rpn-tests.factor +++ b/extra/rpn/rpn-tests.factor @@ -1,4 +1,3 @@ -IN: rpn.tests USING: rpn lists tools.test ; { { 2 } } [ "4 2 -" rpn-parse rpn-eval list>array ] unit-test diff --git a/extra/semantic-versioning/semantic-versioning-tests.factor b/extra/semantic-versioning/semantic-versioning-tests.factor index a07a690916..8d822171ad 100644 --- a/extra/semantic-versioning/semantic-versioning-tests.factor +++ b/extra/semantic-versioning/semantic-versioning-tests.factor @@ -1,6 +1,5 @@ USING: kernel math.order random semantic-versioning sequences sorting tools.test ; -IN: semantic-versioning.tests { { diff --git a/extra/sets/extras/extras-tests.factor b/extra/sets/extras/extras-tests.factor index 1545567013..535e57a5f7 100644 --- a/extra/sets/extras/extras-tests.factor +++ b/extra/sets/extras/extras-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2013 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: math sequences sets.extras tools.test ; -IN: sets.extras.tests { { } } [ { } { } setwise-xor ] unit-test { { 1 } } [ { 1 } { } setwise-xor ] unit-test diff --git a/extra/smalltalk/eval/eval-tests.factor b/extra/smalltalk/eval/eval-tests.factor index eaf4e54698..0a5f821a75 100644 --- a/extra/smalltalk/eval/eval-tests.factor +++ b/extra/smalltalk/eval/eval-tests.factor @@ -1,4 +1,3 @@ -IN: smalltalk.eval.tests USING: smalltalk.eval tools.test io.streams.string kernel ; { 3 } [ "1+2" eval-smalltalk ] unit-test diff --git a/extra/smalltalk/printer/printer-tests.factor b/extra/smalltalk/printer/printer-tests.factor index ec3a9d016a..1998addedc 100644 --- a/extra/smalltalk/printer/printer-tests.factor +++ b/extra/smalltalk/printer/printer-tests.factor @@ -1,4 +1,3 @@ -IN: smalltalk.printer.tests USING: smalltalk.printer tools.test ; { "#((1 2) 'hi')" } [ { { 1 2 } "hi" } smalltalk>string ] unit-test diff --git a/extra/subrip-subtitles/subrip-subtitles-tests.factor b/extra/subrip-subtitles/subrip-subtitles-tests.factor index 5a30f021d6..d58706d349 100644 --- a/extra/subrip-subtitles/subrip-subtitles-tests.factor +++ b/extra/subrip-subtitles/subrip-subtitles-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2014 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: calendar subrip-subtitles tools.test ; -IN: subrip-subtitles.tests { { diff --git a/extra/taxes/usa/usa-tests.factor b/extra/taxes/usa/usa-tests.factor index df2e0fe375..3dca1be169 100644 --- a/extra/taxes/usa/usa-tests.factor +++ b/extra/taxes/usa/usa-tests.factor @@ -1,7 +1,6 @@ USING: kernel money tools.test taxes.usa taxes.usa.federal taxes.usa.mn calendar taxes.usa.w4 usa-cities math.finance ; -IN: taxes.usa.tests { 426 23 diff --git a/extra/terminfo/terminfo-tests.factor b/extra/terminfo/terminfo-tests.factor index c9cad51f1c..d3af00c2ff 100644 --- a/extra/terminfo/terminfo-tests.factor +++ b/extra/terminfo/terminfo-tests.factor @@ -1,5 +1,4 @@ USING: sequences strings terminfo tools.test ; -IN: terminfo.tests { t } [ "vt102" terminfo-names member? diff --git a/extra/time-server/time-server-tests.factor b/extra/time-server/time-server-tests.factor deleted file mode 100644 index a9fac2d9d8..0000000000 --- a/extra/time-server/time-server-tests.factor +++ /dev/null @@ -1,4 +0,0 @@ -! Copyright (C) 2008 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: tools.test time-server ; -IN: time-server.tests diff --git a/extra/tzinfo/tzinfo-tests.factor b/extra/tzinfo/tzinfo-tests.factor index 3cd51462b7..19c8f37b53 100644 --- a/extra/tzinfo/tzinfo-tests.factor +++ b/extra/tzinfo/tzinfo-tests.factor @@ -1,6 +1,4 @@ -USING: calendar formatting kernel tools.test ; - -IN: tzinfo +USING: calendar formatting kernel tools.test tzinfo ; { "Sun Oct 27 01:00:00 2002" diff --git a/extra/usa-cities/usa-cities-tests.factor b/extra/usa-cities/usa-cities-tests.factor index 031bc4fb9f..70c8acb026 100644 --- a/extra/usa-cities/usa-cities-tests.factor +++ b/extra/usa-cities/usa-cities-tests.factor @@ -1,6 +1,5 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel tools.test usa-cities ; -IN: usa-cities.tests { t } [ 55406 find-zip-code name>> "Minneapolis" = ] unit-test