From 3c11991843ef547fb2044bd38fa5b4950277db1b Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 12 Apr 2010 18:29:47 -0700 Subject: [PATCH] classes.struct, specialized-arrays: fix unit tests to work when forget-tests? is on --- basis/classes/struct/struct-tests.factor | 12 +++++-- .../specialized-arrays-tests.factor | 34 ++++++++++++++----- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor index dafd31efde..13088e1469 100644 --- a/basis/classes/struct/struct-tests.factor +++ b/basis/classes/struct/struct-tests.factor @@ -4,9 +4,11 @@ assocs byte-arrays classes.struct classes.tuple.parser classes.tuple.private classes.tuple combinators compiler.tree.debugger compiler.units destructors io.encodings.utf8 io.pathnames io.streams.string kernel libc literals math mirrors namespaces -prettyprint prettyprint.config see sequences specialized-arrays system -tools.test parser lexer eval layouts generic.single classes ; +prettyprint prettyprint.config see sequences specialized-arrays +system tools.test parser lexer eval layouts generic.single classes +vocabs ; FROM: math => float ; +FROM: specialized-arrays.private => specialized-array-vocab ; QUALIFIED-WITH: alien.c-types c SPECIALIZED-ARRAY: char SPECIALIZED-ARRAY: int @@ -303,6 +305,12 @@ SPECIALIZED-ARRAY: struct-test-optimization { x>> } inlined? ] unit-test +[ ] [ + [ + struct-test-optimization specialized-array-vocab forget-vocab + ] with-compilation-unit +] unit-test + ! Test cloning structs STRUCT: clone-test-struct { x int } { y char[3] } ; diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/basis/specialized-arrays/specialized-arrays-tests.factor index 645606edc5..2dee88df88 100644 --- a/basis/specialized-arrays/specialized-arrays-tests.factor +++ b/basis/specialized-arrays/specialized-arrays-tests.factor @@ -1,13 +1,13 @@ -IN: specialized-arrays.tests -USING: tools.test alien.syntax specialized-arrays -specialized-arrays.private sequences alien accessors -kernel arrays combinators compiler compiler.units classes.struct -combinators.smart compiler.tree.debugger math libc destructors -sequences.private multiline eval words vocabs namespaces -assocs prettyprint alien.data math.vectors definitions -compiler.test ; +USING: tools.test alien.syntax specialized-arrays sequences +alien accessors kernel arrays combinators compiler +compiler.units classes.struct combinators.smart +compiler.tree.debugger math libc destructors sequences.private +multiline eval words vocabs namespaces assocs prettyprint +alien.data math.vectors definitions compiler.test ; +FROM: specialized-arrays.private => specialized-array-vocab ; FROM: alien.c-types => int float bool char float ulonglong ushort uint heap-size little-endian? ; +IN: specialized-arrays.tests SPECIALIZED-ARRAY: int SPECIALIZED-ARRAYS: bool ushort char uint float ulonglong ; @@ -101,6 +101,12 @@ SPECIALIZED-ARRAY: test-struct } second ] unit-test +[ ] [ + [ + test-struct specialized-array-vocab forget-vocab + ] with-compilation-unit +] unit-test + ! Regression STRUCT: fixed-string { text char[64] } ; @@ -115,6 +121,12 @@ SPECIALIZED-ARRAY: fixed-string ALIEN: 123 100 byte-length ] unit-test +[ ] [ + [ + fixed-string specialized-array-vocab forget-vocab + ] with-compilation-unit +] unit-test + ! Test prettyprinting [ "int-array{ 1 2 3 }" ] [ int-array{ 1 2 3 } unparse ] unit-test [ "int-array@ f 100" ] [ f 100 unparse ] unit-test @@ -172,3 +184,9 @@ SPECIALIZED-ARRAY: struct-resize-test [ 80 ] [ 10 byte-length ] unit-test [ { 10 20 30 } ] [ { 10 20 30 } struct-resize-test-usage ] unit-test + +[ ] [ + [ + struct-resize-test specialized-array-vocab forget-vocab + ] with-compilation-unit +] unit-test