diff options
Diffstat (limited to 'stdlib/source/test/aedifex')
| -rw-r--r-- | stdlib/source/test/aedifex/cli.lux | 70 | ||||
| -rw-r--r-- | stdlib/source/test/aedifex/command/auto.lux | 11 | ||||
| -rw-r--r-- | stdlib/source/test/aedifex/command/build.lux | 13 | ||||
| -rw-r--r-- | stdlib/source/test/aedifex/parser.lux | 29 | ||||
| -rw-r--r-- | stdlib/source/test/aedifex/profile.lux | 1 |
5 files changed, 64 insertions, 60 deletions
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux index 85e8e7bc5..0dd70ae6d 100644 --- a/stdlib/source/test/aedifex/cli.lux +++ b/stdlib/source/test/aedifex/cli.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["[0]" cli]]] - [data - ["[0]" text] - [collection - ["[0]" list]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" pipe] + ["[0]" try] + [parser + ["[0]" cli]]] + [data + ["[0]" text] + [collection + ["[0]" list]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile]]]]) (def: compilation (Random /.Compilation) @@ -76,12 +76,13 @@ (|> expected ..format (cli.result /.command) - (case> {try.#Success [names actual]} - (and (# (list.equivalence text.equivalence) = (list //.default) names) - (# /.equivalence = expected actual)) - - {try.#Failure error} - false))))) + (pipe.case + {try.#Success [names actual]} + (and (# (list.equivalence text.equivalence) = (list //.default) names) + (# /.equivalence = expected actual)) + + {try.#Failure error} + false))))) (def: with_profile Test @@ -93,12 +94,13 @@ ..format (list& "with" expected_profile) (cli.result /.command) - (case> {try.#Success [actual_profile actual_command]} - (and (# (list.equivalence text.equivalence) = (list expected_profile //.default) actual_profile) - (# /.equivalence = expected_command actual_command)) - - {try.#Failure error} - false))))) + (pipe.case + {try.#Success [actual_profile actual_command]} + (and (# (list.equivalence text.equivalence) = (list expected_profile //.default) actual_profile) + (# /.equivalence = expected_command actual_command)) + + {try.#Failure error} + false))))) (def: .public test Test diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index a9e9c56fb..bfdbb789e 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -5,7 +5,7 @@ [abstract [monad {"+" do}]] [control - [pipe {"+" case>}] + ["[0]" pipe] ["[0]" try] [parser ["[0]" environment]] @@ -110,11 +110,12 @@ fs (shell.async ($build.good_shell [])) resolution) - (# ! each (|>> (case> {try.#Failure error} - (same? end_signal error) + (# ! each (|>> (pipe.case + {try.#Failure error} + (same? end_signal error) - {try.#Success _} - false)))) + {try.#Success _} + false)))) correct_number_of_runs! (|> @runs atom.read! async.future diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index 0b8eac768..f8d2d46ec 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -5,8 +5,8 @@ [abstract [monad {"+" do}]] [control - [pipe {"+" case>}] [io {"+" IO}] + ["[0]" pipe] ["[0]" try] ["[0]" exception] [concurrency @@ -232,11 +232,12 @@ actual/1 (# console read_line []) actual/2 (# console read_line []) end! (|> (# console read_line []) - (# ! each (|>> (case> {try.#Failure error} - true - - {try.#Success _} - false) + (# ! each (|>> (pipe.case + {try.#Failure error} + true + + {try.#Success _} + false) {try.#Success})))] (in (and (text#= expected/0 actual/0) (text#= expected/1 actual/1) diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index 1d3168d93..f529c2d0a 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -6,7 +6,7 @@ [monad {"+" do}] [hash {"+" Hash}]] [control - [pipe {"+" case>}] + ["[0]" pipe] ["[0]" try] [parser ["<[0]>" code]]] @@ -84,16 +84,17 @@ //format.project list (<code>.result /.project) - (case> {try.#Success actual} - (|> expected - ..with_empty_profile - dictionary.entries - (list#each (function (_ [name profile]) - [name (|> profile - ..with_default_sources - ..with_default_repository)])) - (dictionary.of_list text.hash) - (# //project.equivalence = actual)) - - {try.#Failure error} - false)))))) + (pipe.case + {try.#Success actual} + (|> expected + ..with_empty_profile + dictionary.entries + (list#each (function (_ [name profile]) + [name (|> profile + ..with_default_sources + ..with_default_repository)])) + (dictionary.of_list text.hash) + (# //project.equivalence = actual)) + + {try.#Failure error} + false)))))) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index 1cfc7eb40..c7f63d254 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -9,7 +9,6 @@ ["$[0]" equivalence] ["$[0]" monoid]]] [control - [pipe {"+" case>}] ["[0]" try] [parser ["[0]" cli]]] |