From 6890ec3fe42565a582b95555f8aae78ea7d1036e Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 14 Feb 2018 17:01:11 -0800 Subject: [PATCH] extra: remove some unneeded IN: in -tests. --- extra/qw/qw-tests.factor | 1 - extra/robots/robots-tests.factor | 1 - extra/rot13/rot13-tests.factor | 4 +--- extra/sequences/abbrev/abbrev-tests.factor | 1 - extra/sequences/extras/extras-tests.factor | 1 - extra/sequences/inserters/inserters-tests.factor | 1 - extra/sequences/modified/modified-tests.factor | 1 - extra/sequences/repeating/repeating-tests.factor | 1 - extra/sequences/rotated/rotated-tests.factor | 1 - extra/sequences/shifted/shifted-tests.factor | 1 - extra/sequences/snipped/snipped-tests.factor | 1 - extra/sequences/squish/squish-tests.factor | 1 - extra/sequences/zipped/zipped-tests.factor | 1 - extra/sorting/bubble/bubble-tests.factor | 1 - extra/sorting/heap/heap-tests.factor | 1 - extra/sorting/quick/quick-tests.factor | 1 - extra/splitting/extras/extras-tests.factor | 2 -- extra/successor/successor-tests.factor | 2 -- extra/synth/synth-tests.factor | 2 -- extra/tools/cal/cal-tests.factor | 1 - extra/txon/txon-tests.factor | 3 --- extra/ui/gadgets/charts/charts-tests.factor | 4 ---- extra/ui/gadgets/charts/lines/lines-tests.factor | 1 - extra/ui/gadgets/lists/lists-tests.factor | 5 +++-- extra/units/imperial/imperial-tests.factor | 1 - extra/units/si/si-tests.factor | 1 - extra/uu/uu-tests.factor | 2 +- extra/wikipedia/wikipedia-tests.factor | 1 - extra/z-algorithm/z-algorithm-tests.factor | 1 - extra/zeromq/zeromq-tests.factor | 1 - extra/zoneinfo/zoneinfo-tests.factor | 1 - 31 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 extra/ui/gadgets/charts/charts-tests.factor diff --git a/extra/qw/qw-tests.factor b/extra/qw/qw-tests.factor index 029aa179ca..4dabceb2fd 100644 --- a/extra/qw/qw-tests.factor +++ b/extra/qw/qw-tests.factor @@ -1,6 +1,5 @@ ! Copyright (C) 2009 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. USING: qw tools.test ; -IN: qw.tests { { "zippity" "doo" "dah" } } [ qw{ zippity doo dah } ] unit-test diff --git a/extra/robots/robots-tests.factor b/extra/robots/robots-tests.factor index 9b40916f93..dac49e4c8e 100644 --- a/extra/robots/robots-tests.factor +++ b/extra/robots/robots-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: calendar io.encodings.utf8 io.files robots tools.test urls ; -IN: robots.tests { { "http://www.chiplist.com/sitemap.txt" } diff --git a/extra/rot13/rot13-tests.factor b/extra/rot13/rot13-tests.factor index 790eaecdc5..9d705e07de 100644 --- a/extra/rot13/rot13-tests.factor +++ b/extra/rot13/rot13-tests.factor @@ -1,7 +1,5 @@ -USING: tools.test ; - -IN: rot13 +USING: rot13 tools.test ; { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" } [ "NOPQRSTUVWXYZABCDEFGHIJKLMnopqrstuvwxyzabcdefghijklm" rot13 diff --git a/extra/sequences/abbrev/abbrev-tests.factor b/extra/sequences/abbrev/abbrev-tests.factor index de6ba280b8..d9e018f835 100644 --- a/extra/sequences/abbrev/abbrev-tests.factor +++ b/extra/sequences/abbrev/abbrev-tests.factor @@ -1,5 +1,4 @@ USING: assocs sequences.abbrev tools.test ; -IN: sequences.abbrev.tests { { "hello" "help" } } [ "he" { "apple" "hello" "help" } abbrev at diff --git a/extra/sequences/extras/extras-tests.factor b/extra/sequences/extras/extras-tests.factor index 880fbbd4ce..50d2f4118a 100644 --- a/extra/sequences/extras/extras-tests.factor +++ b/extra/sequences/extras/extras-tests.factor @@ -1,7 +1,6 @@ USING: accessors arrays ascii io io.streams.string kernel make math math.vectors random sequences sequences.extras strings tools.test vectors vocabs ; -IN: sequences.extras.tests { V{ { 0 104 } { 2 108 } { 3 108 } } } [ "hello" [ even? ] find-all ] unit-test diff --git a/extra/sequences/inserters/inserters-tests.factor b/extra/sequences/inserters/inserters-tests.factor index fcd43968de..a0d0ae4985 100644 --- a/extra/sequences/inserters/inserters-tests.factor +++ b/extra/sequences/inserters/inserters-tests.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: assocs kernel sequences sequences.inserters tools.test unicode ; -IN: sequences.inserters.tests { V{ 1 2 "Three" "Four" "Five" } } [ { "three" "four" "five" } diff --git a/extra/sequences/modified/modified-tests.factor b/extra/sequences/modified/modified-tests.factor index c097a257e5..108ff0f640 100644 --- a/extra/sequences/modified/modified-tests.factor +++ b/extra/sequences/modified/modified-tests.factor @@ -1,5 +1,4 @@ USING: accessors arrays kernel sequences sequences.modified tools.test ; -IN: sequences.modified.tests { { 2 4 6 } } [ { 1 2 3 } 2 scale ] unit-test { { 1 4 3 } } [ { 1 2 3 } 2 8 1 pick set-nth seq>> ] unit-test diff --git a/extra/sequences/repeating/repeating-tests.factor b/extra/sequences/repeating/repeating-tests.factor index e42b70f950..6fba79cc56 100644 --- a/extra/sequences/repeating/repeating-tests.factor +++ b/extra/sequences/repeating/repeating-tests.factor @@ -1,5 +1,4 @@ USING: sequences.repeating tools.test ; -IN: sequences.repeating.tests { { 1 2 3 1 2 } } [ { 1 2 3 } 5 cycle ] unit-test { { 1 2 3 1 2 3 1 2 3 } } [ { 1 2 3 } 9 cycle ] unit-test diff --git a/extra/sequences/rotated/rotated-tests.factor b/extra/sequences/rotated/rotated-tests.factor index 5981e1ef66..2236e15d34 100644 --- a/extra/sequences/rotated/rotated-tests.factor +++ b/extra/sequences/rotated/rotated-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license USING: strings tools.test ; -IN: sequences.rotated { "fasd" } [ "asdf" -1 >string ] unit-test { "sdfa" } [ "asdf" 1 >string ] unit-test diff --git a/extra/sequences/shifted/shifted-tests.factor b/extra/sequences/shifted/shifted-tests.factor index 9ae89e9dbe..d7510eab30 100644 --- a/extra/sequences/shifted/shifted-tests.factor +++ b/extra/sequences/shifted/shifted-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license USING: arrays sequences tools.test ; -IN: sequences.shifted { { 1 2 3 7 } } [ 4 -1 7 >array ] unit-test { { 7 0 1 2 } } [ 4 1 7 >array ] unit-test diff --git a/extra/sequences/snipped/snipped-tests.factor b/extra/sequences/snipped/snipped-tests.factor index 3d3af20793..b74b9c9a3a 100644 --- a/extra/sequences/snipped/snipped-tests.factor +++ b/extra/sequences/snipped/snipped-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license USING: arrays sequences tools.test ; -IN: sequences.snipped { { 0 1 2 5 6 } } [ 3 5 7 >array ] unit-test { { 0 1 2 } } [ 3 10 7 >array ] unit-test diff --git a/extra/sequences/squish/squish-tests.factor b/extra/sequences/squish/squish-tests.factor index 254ac1e512..b8ddff06ad 100644 --- a/extra/sequences/squish/squish-tests.factor +++ b/extra/sequences/squish/squish-tests.factor @@ -1,6 +1,5 @@ ! (c)2009 Slava Pestov & Joe Groff, see BSD license USING: kernel sequences sequences.squish tools.test vectors ; -IN: sequences.squish.tests { { { 1 2 3 } { 4 } { 5 6 } } } [ V{ { 1 2 3 } V{ { 4 } { 5 6 } } } diff --git a/extra/sequences/zipped/zipped-tests.factor b/extra/sequences/zipped/zipped-tests.factor index 0bc45cffd7..884d5fc846 100644 --- a/extra/sequences/zipped/zipped-tests.factor +++ b/extra/sequences/zipped/zipped-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license USING: arrays tools.test ; -IN: sequences.zipped { { { 1 4 } { 2 5 } { 3 6 } } } [ { 1 2 3 } { 4 5 6 } >array ] unit-test diff --git a/extra/sorting/bubble/bubble-tests.factor b/extra/sorting/bubble/bubble-tests.factor index 34a90fbee5..01eeb6288e 100644 --- a/extra/sorting/bubble/bubble-tests.factor +++ b/extra/sorting/bubble/bubble-tests.factor @@ -1,5 +1,4 @@ USING: kernel tools.test ; -IN: sorting.bubble { { } } [ { } dup natural-bubble-sort! ] unit-test { { 1 } } [ { 1 } dup natural-bubble-sort! ] unit-test diff --git a/extra/sorting/heap/heap-tests.factor b/extra/sorting/heap/heap-tests.factor index da88b3a650..53f5608051 100644 --- a/extra/sorting/heap/heap-tests.factor +++ b/extra/sorting/heap/heap-tests.factor @@ -1,5 +1,4 @@ USING: kernel sequences tools.test ; -IN: sorting.heap { { } } [ { } heapsort ] unit-test { { 1 } } [ { 1 } heapsort ] unit-test diff --git a/extra/sorting/quick/quick-tests.factor b/extra/sorting/quick/quick-tests.factor index 739f8d88f3..ac7774bbfd 100644 --- a/extra/sorting/quick/quick-tests.factor +++ b/extra/sorting/quick/quick-tests.factor @@ -1,5 +1,4 @@ USING: kernel sequences tools.test ; -IN: sorting.quick { { } } [ { } dup natural-sort! ] unit-test { { 1 } } [ { 1 } dup natural-sort! ] unit-test diff --git a/extra/splitting/extras/extras-tests.factor b/extra/splitting/extras/extras-tests.factor index e36052e4dc..2ec7f23f27 100644 --- a/extra/splitting/extras/extras-tests.factor +++ b/extra/splitting/extras/extras-tests.factor @@ -1,8 +1,6 @@ USING: ascii kernel math sequences strings tools.test ; -IN: splitting.extras - { { } } [ { } { 0 } split* ] unit-test { { { 1 2 3 } } } [ { 1 2 3 } { 0 } split* ] unit-test { { { 0 } } } [ { 0 } { 0 } split* ] unit-test diff --git a/extra/successor/successor-tests.factor b/extra/successor/successor-tests.factor index 3cd167f568..416582accc 100644 --- a/extra/successor/successor-tests.factor +++ b/extra/successor/successor-tests.factor @@ -3,8 +3,6 @@ USING: successor tools.test ; -IN: successor - [ "" ] [ "" successor ] unit-test [ "abce" ] [ "abcd" successor ] unit-test [ "THX1139" ] [ "THX1138" successor ] unit-test diff --git a/extra/synth/synth-tests.factor b/extra/synth/synth-tests.factor index f9c4287c84..01125e91de 100644 --- a/extra/synth/synth-tests.factor +++ b/extra/synth/synth-tests.factor @@ -1,7 +1,5 @@ USING: synth tools.test ; -IN: synth.tests - { { 0.0 diff --git a/extra/tools/cal/cal-tests.factor b/extra/tools/cal/cal-tests.factor index ce4115e371..fedcfd76a4 100644 --- a/extra/tools/cal/cal-tests.factor +++ b/extra/tools/cal/cal-tests.factor @@ -1,5 +1,4 @@ USING: calendar tools.cal.private tools.test ; -IN: tools.cal.tests { " October 2010 " diff --git a/extra/txon/txon-tests.factor b/extra/txon/txon-tests.factor index 1420419efd..8889c0523b 100644 --- a/extra/txon/txon-tests.factor +++ b/extra/txon/txon-tests.factor @@ -1,8 +1,5 @@ - USING: tools.test txon ; -IN: txon.tests - { "ABC" } [ "ABC" >txon ] unit-test { "A\\`C" } [ "A`C" >txon ] unit-test diff --git a/extra/ui/gadgets/charts/charts-tests.factor b/extra/ui/gadgets/charts/charts-tests.factor deleted file mode 100644 index 5d8d265414..0000000000 --- a/extra/ui/gadgets/charts/charts-tests.factor +++ /dev/null @@ -1,4 +0,0 @@ -! Copyright (C) 2017 Alexander Ilin. -! See http://factorcode.org/license.txt for BSD license. -USING: tools.test ui.gadgets.charts ; -IN: ui.gadgets.charts.tests diff --git a/extra/ui/gadgets/charts/lines/lines-tests.factor b/extra/ui/gadgets/charts/lines/lines-tests.factor index 4d2f918591..02b73dc115 100644 --- a/extra/ui/gadgets/charts/lines/lines-tests.factor +++ b/extra/ui/gadgets/charts/lines/lines-tests.factor @@ -3,7 +3,6 @@ USING: kernel math math.ratios sequences tools.test ui.gadgets.charts.lines ui.gadgets.charts.lines.private ui.gadgets.charts.utils ; -IN: ui.gadgets.charts.lines.tests { -2/3 } [ { 1 3 } { -2 5 } calc-line-slope ] unit-test [ { 5 0 } { 5 5 } calc-line-slope ] [ division-by-zero? ] must-fail-with diff --git a/extra/ui/gadgets/lists/lists-tests.factor b/extra/ui/gadgets/lists/lists-tests.factor index 4caa473c0f..1562d9ee36 100644 --- a/extra/ui/gadgets/lists/lists-tests.factor +++ b/extra/ui/gadgets/lists/lists-tests.factor @@ -1,5 +1,6 @@ -IN: ui.gadgets.lists.tests USING: ui.gadgets.lists models prettyprint math tools.test kernel ; -{ } [ [ drop ] [ 3 + . ] f invoke-value-action ] unit-test +{ } [ + [ drop ] [ 3 + . ] f invoke-value-action +] unit-test diff --git a/extra/units/imperial/imperial-tests.factor b/extra/units/imperial/imperial-tests.factor index 40afbbd7f7..c2e35abdbb 100644 --- a/extra/units/imperial/imperial-tests.factor +++ b/extra/units/imperial/imperial-tests.factor @@ -1,5 +1,4 @@ USING: kernel math tools.test units.imperial inverse ; -IN: units.imperial.tests { 1 } [ 12 inches [ feet ] undo ] unit-test { 12 } [ 1 feet [ inches ] undo ] unit-test diff --git a/extra/units/si/si-tests.factor b/extra/units/si/si-tests.factor index 8ee09210a2..711381b8df 100644 --- a/extra/units/si/si-tests.factor +++ b/extra/units/si/si-tests.factor @@ -1,6 +1,5 @@ USING: kernel tools.test units.si inverse math.constants math.functions units.imperial ; -IN: units.si.tests { t } [ 1 m 100 cm = ] unit-test diff --git a/extra/uu/uu-tests.factor b/extra/uu/uu-tests.factor index 4fa5d7b945..7cd30d7bb0 100644 --- a/extra/uu/uu-tests.factor +++ b/extra/uu/uu-tests.factor @@ -1,5 +1,5 @@ USING: kernel tools.test ; -IN: uu +IN: uu.tests CONSTANT: plain "The smooth-scaled python crept over the sleeping dog" diff --git a/extra/wikipedia/wikipedia-tests.factor b/extra/wikipedia/wikipedia-tests.factor index 4c9fbbf215..c00e9b4766 100644 --- a/extra/wikipedia/wikipedia-tests.factor +++ b/extra/wikipedia/wikipedia-tests.factor @@ -1,5 +1,4 @@ USING: calendar tools.test urls wikipedia.private ; -IN: wikipedia.tests { URL" http://en.wikipedia.org/wiki/October_10" diff --git a/extra/z-algorithm/z-algorithm-tests.factor b/extra/z-algorithm/z-algorithm-tests.factor index 7e0c7732ba..e4a182457f 100644 --- a/extra/z-algorithm/z-algorithm-tests.factor +++ b/extra/z-algorithm/z-algorithm-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2010 Dmitry Shubin. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test z-algorithm ; -IN: z-algorithm.tests { 0 } [ "qwerty" "" lcp ] unit-test { 0 } [ "qwerty" "asdf" lcp ] unit-test diff --git a/extra/zeromq/zeromq-tests.factor b/extra/zeromq/zeromq-tests.factor index 0c7d4c9016..fd0c103863 100644 --- a/extra/zeromq/zeromq-tests.factor +++ b/extra/zeromq/zeromq-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2011-2013 Eungju PARK, John Benediktsson. ! See http://factorcode.org/license.txt for BSD license. USING: destructors sequences tools.test zeromq ; -IN: zeromq.tests { t } [ zmq-msg-size { 32 48 64 } member? diff --git a/extra/zoneinfo/zoneinfo-tests.factor b/extra/zoneinfo/zoneinfo-tests.factor index 4f5f77d672..56d60772ed 100644 --- a/extra/zoneinfo/zoneinfo-tests.factor +++ b/extra/zoneinfo/zoneinfo-tests.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2013 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: kernel sequences tools.test zoneinfo ; -IN: zoneinfo.tests { t } [ "PST8PDT" find-zone-rules and >boolean ] unit-test -- 2.34.1