Skip to content

Commit

Permalink
Implement test discovery
Browse files Browse the repository at this point in the history
`testInDir dir ...` lists all directories in `dir` which contains
`run` files, and such directories are considered tests.

This is done to make test addition/maintenance cheaper.

Convert some test directories to `testInDir`, but not all of them
because
* some directories are listed in several test groups
* other directories are have some tests disabled
  • Loading branch information
stepancheg committed Jul 17, 2021
1 parent 4eff6ac commit 7325002
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 60 deletions.
28 changes: 28 additions & 0 deletions libs/test/Test/Golden.idr
Expand Up @@ -380,6 +380,34 @@ record TestPool where
codegen : Codegen
testCases : List String

||| Find all the test in the given directory.
export
testsInDir : (dirName : String) -> (testNameFilter : String -> Bool) -> (poolName : String) -> List Requirement -> Codegen -> IO TestPool
testsInDir dirName testNameFilter poolName reqs cg = do
Right names <- listDir dirName
| Left e => do putStrLn ("failed to list " ++ dirName ++ ": " ++ show e)
exitFailure
let names = [n | n <- names, testNameFilter n]
let testNames = [dirName ++ "/" ++ n | n <- names]
testNames <- filter testNames
when (length testNames == 0) $ do
putStrLn ("no tests found in " ++ dirName)
exitFailure
pure $ MkTestPool poolName reqs cg testNames
where
-- Directory without `run` file is not a test
isTest : (path : String) -> IO Bool
isTest path = exists (path ++ "/run")

filter : (testPaths : List String) -> IO (List String)
filter [] = pure []
filter (p :: ps) =
do rem <- filter ps
case !(isTest p) of
True => pure $ p :: rem
False => pure rem


||| Only keep the tests that have been asked for
export
filterTests : Options -> List String -> List String
Expand Down
91 changes: 31 additions & 60 deletions tests/Main.idr
@@ -1,5 +1,9 @@
module Main

import System
import System.Directory
import System.File

import Test.Golden

%default covering
Expand Down Expand Up @@ -199,12 +203,8 @@ idrisTests = MkTestPool "Misc" [] Nothing
-- golden file testing
"golden001"]

typeddTests : TestPool
typeddTests = MkTestPool "Type Driven Development" [] Nothing
[ "chapter01", "chapter02", "chapter03", "chapter04", "chapter05"
, "chapter06", "chapter07", "chapter08", "chapter09", "chapter10"
, "chapter11", "chapter12", "chapter13", "chapter14"
]
typeddTests : IO TestPool
typeddTests = testsInDir "typedd-book" (const True) "Type Driven Development" [] Nothing

chezTests : TestPool
chezTests = MkTestPool "Chez backend" [] (Just Chez)
Expand All @@ -226,12 +226,8 @@ chezTests = MkTestPool "Chez backend" [] (Just Chez)
, "channels001", "channels002", "channels003", "channels004", "channels005"
]

refcTests : TestPool
refcTests = MkTestPool "Reference counting C backend" [] (Just C)
[ "refc001" , "refc002"
, "strings", "integers", "doubles"
, "buffer", "clock", "args"
]
refcTests : IO TestPool
refcTests = testsInDir "refc" (const True) "Reference counting C backend" [] (Just C)

racketTests : TestPool
racketTests = MkTestPool "Racket backend" [] (Just Racket)
Expand Down Expand Up @@ -264,57 +260,32 @@ nodeTests = MkTestPool "Node backend" [] (Just Node)
, "integers"
]

vmcodeInterpTests : TestPool
vmcodeInterpTests = MkTestPool "VMCode interpreter" [] Nothing
[ "basic001"
]
vmcodeInterpTests : IO TestPool
vmcodeInterpTests = testsInDir "vmcode" (const True) "VMCode interpreter" [] Nothing

ideModeTests : TestPool
ideModeTests = MkTestPool "IDE mode" [] Nothing
[ "ideMode001", "ideMode002", "ideMode003", "ideMode004", "ideMode005"
]
ideModeTests : IO TestPool
ideModeTests = testsInDir "ideMode" (const True) "IDE mode" [] Nothing

preludeTests : TestPool
preludeTests = MkTestPool "Prelude library" [] Nothing
[ "reg001"
]
preludeTests : IO TestPool
preludeTests = testsInDir "prelude" (const True) "Prelude library" [] Nothing

templateTests : TestPool
templateTests = MkTestPool "Test templates" [] Nothing
[ "simple-test", "ttimp", "with-ipkg"
]
templateTests : IO TestPool
templateTests = testsInDir "templates" (const True) "Test templates" [] Nothing

-- base library tests are run against
-- each codegen supported and to keep
-- things simple it's all one test group
-- that only runs if all backends are
-- available.
baseLibraryTests : TestPool
baseLibraryTests = MkTestPool "Base library" [Chez, Node] Nothing
[ "control_app001"
, "system_file001"
, "system_info_os001"
, "system_system"
, "data_bits001"
, "data_string_lines001"
, "data_string_unlines001"
, "system_directory"
, "system_errno"
, "system_info001"
, "system_signal001", "system_signal002", "system_signal003", "system_signal004"
]
baseLibraryTests : IO TestPool
baseLibraryTests = testsInDir "base" (const True) "Base library" [Chez, Node] Nothing

-- same behavior as `baseLibraryTests`
contribLibraryTests : TestPool
contribLibraryTests = MkTestPool "Contrib library" [Chez, Node] Nothing
[ "json_001"
]
contribLibraryTests : IO TestPool
contribLibraryTests = testsInDir "contrib" (const True) "Contrib library" [Chez, Node] Nothing

codegenTests : TestPool
codegenTests = MkTestPool "Code generation" [] Nothing
[ "con001"
, "builtin001"
]
codegenTests : IO TestPool
codegenTests = testsInDir "codegen" (const True) "Code generation" [] Nothing

main : IO ()
main = runner $
Expand All @@ -334,18 +305,18 @@ main = runner $
, testPaths "idris2" idrisTestsBuiltin
, testPaths "idris2" idrisTestsEvaluator
, testPaths "idris2" idrisTests
, testPaths "typedd-book" typeddTests
, testPaths "ideMode" ideModeTests
, testPaths "prelude" preludeTests
, testPaths "base" baseLibraryTests
, testPaths "contrib" contribLibraryTests
, !typeddTests
, !ideModeTests
, !preludeTests
, !baseLibraryTests
, !contribLibraryTests
, testPaths "chez" chezTests
, testPaths "refc" refcTests
, !refcTests
, testPaths "racket" racketTests
, testPaths "node" nodeTests
, testPaths "vmcode" vmcodeInterpTests
, testPaths "templates" templateTests
, testPaths "codegen" codegenTests
, !vmcodeInterpTests
, !templateTests
, !codegenTests
]
++ map (testPaths "allbackends" . idrisTestsAllBackends) [Chez, Node, Racket]

Expand Down

0 comments on commit 7325002

Please sign in to comment.