From 8c63a525089597af1f9282c76daf97bf2b6058e0 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 22 Oct 2022 12:43:39 -0400 Subject: New (optional) names for Frac type + fixed module of CSP concurrency. --- stdlib/source/test/lux/control.lux | 4 +- stdlib/source/test/lux/control/concurrency/cps.lux | 92 ---------------------- stdlib/source/test/lux/control/concurrency/csp.lux | 92 ++++++++++++++++++++++ stdlib/source/test/lux/math/number/frac.lux | 2 +- stdlib/source/test/lux/world/input/keyboard.lux | 2 +- stdlib/source/test/lux/world/net.lux | 2 + stdlib/source/test/lux/world/net/http/client.lux | 5 +- stdlib/source/test/lux/world/net/http/header.lux | 73 +++++++++++++++++ stdlib/source/test/lux/world/net/http/status.lux | 1 + 9 files changed, 175 insertions(+), 98 deletions(-) delete mode 100644 stdlib/source/test/lux/control/concurrency/cps.lux create mode 100644 stdlib/source/test/lux/control/concurrency/csp.lux create mode 100644 stdlib/source/test/lux/world/net/http/header.lux (limited to 'stdlib/source/test') diff --git a/stdlib/source/test/lux/control.lux b/stdlib/source/test/lux/control.lux index a53c174d5..5a57ac13d 100644 --- a/stdlib/source/test/lux/control.lux +++ b/stdlib/source/test/lux/control.lux @@ -15,7 +15,7 @@ ["[1]/[0]" semaphore] ["[1]/[0]" stm] ["[1]/[0]" event] - ["[1]/[0]" cps] + ["[1]/[0]" csp] ["[1]/[0]" incremental] ["[1]/[0]" structured] ["[1]/[0]" behavioral]] @@ -50,7 +50,7 @@ /concurrency/semaphore.test /concurrency/stm.test /concurrency/event.test - /concurrency/cps.test + /concurrency/csp.test /concurrency/incremental.test /concurrency/structured.test /concurrency/behavioral.test diff --git a/stdlib/source/test/lux/control/concurrency/cps.lux b/stdlib/source/test/lux/control/concurrency/cps.lux deleted file mode 100644 index 5bf53cb96..000000000 --- a/stdlib/source/test/lux/control/concurrency/cps.lux +++ /dev/null @@ -1,92 +0,0 @@ -(.require - [library - [lux (.except) - [abstract - [monad (.only do)] - [\\specification - ["$[0]" functor (.only Injection Comparison)] - ["$[0]" monad]]] - [control - ["[0]" io] - ["[0]" try] - ["[0]" exception]] - [math - ["[0]" random]] - [test - ["_" property (.only Test)] - ["[0]" unit]]]] - [\\library - ["[0]" / (.only) - [// - ["[0]" async]]]]) - -(def injection - (Injection /.Process) - (at /.monad in)) - -(def comparison - (Comparison /.Process) - (function (_ == left right) - (io.run! - (do io.monad - [?left (async.value left) - ?right (async.value right)] - (in (when [?left ?right] - [{.#Some {try.#Success left}} - {.#Some {try.#Success right}}] - (== left right) - - _ - false)))))) - -(def .public test - Test - (<| (_.covering /._) - (do [! random.monad] - [expected random.nat] - (all _.and - (_.for [/.Process] - (all _.and - (_.for [/.functor] - ($functor.spec ..injection ..comparison /.functor)) - (_.for [/.monad] - ($monad.spec ..injection ..comparison /.monad)) - )) - (_.coverage [/.Channel /.Channel' /.Sink /.channel] - ... This is already been tested for the FRP module. - true) - (in (do async.monad - [it (do /.monad - [.let [[channel sink] (/.channel [])] - _ (/.write expected sink) - [actual channel] (/.read channel)] - (in (same? expected actual)))] - (unit.coverage [/.read /.write] - (try.else false it)))) - (in (do async.monad - [it (do /.monad - [.let [[channel sink] (/.channel [])] - _ (/.close sink) - it (/.try (/.write expected sink))] - (in (when it - {try.#Failure _} - true - - _ - false)))] - (unit.coverage [/.close /.try] - (try.else false it)))) - (in (do async.monad - [it (do /.monad - [.let [[channel sink] (/.channel [])] - _ (/.close sink) - it (/.try (/.read channel))] - (in (when it - {try.#Failure error} - (exception.match? /.channel_has_been_closed error) - - _ - false)))] - (unit.coverage [/.channel_has_been_closed] - (try.else false it)))) - )))) diff --git a/stdlib/source/test/lux/control/concurrency/csp.lux b/stdlib/source/test/lux/control/concurrency/csp.lux new file mode 100644 index 000000000..5bf53cb96 --- /dev/null +++ b/stdlib/source/test/lux/control/concurrency/csp.lux @@ -0,0 +1,92 @@ +(.require + [library + [lux (.except) + [abstract + [monad (.only do)] + [\\specification + ["$[0]" functor (.only Injection Comparison)] + ["$[0]" monad]]] + [control + ["[0]" io] + ["[0]" try] + ["[0]" exception]] + [math + ["[0]" random]] + [test + ["_" property (.only Test)] + ["[0]" unit]]]] + [\\library + ["[0]" / (.only) + [// + ["[0]" async]]]]) + +(def injection + (Injection /.Process) + (at /.monad in)) + +(def comparison + (Comparison /.Process) + (function (_ == left right) + (io.run! + (do io.monad + [?left (async.value left) + ?right (async.value right)] + (in (when [?left ?right] + [{.#Some {try.#Success left}} + {.#Some {try.#Success right}}] + (== left right) + + _ + false)))))) + +(def .public test + Test + (<| (_.covering /._) + (do [! random.monad] + [expected random.nat] + (all _.and + (_.for [/.Process] + (all _.and + (_.for [/.functor] + ($functor.spec ..injection ..comparison /.functor)) + (_.for [/.monad] + ($monad.spec ..injection ..comparison /.monad)) + )) + (_.coverage [/.Channel /.Channel' /.Sink /.channel] + ... This is already been tested for the FRP module. + true) + (in (do async.monad + [it (do /.monad + [.let [[channel sink] (/.channel [])] + _ (/.write expected sink) + [actual channel] (/.read channel)] + (in (same? expected actual)))] + (unit.coverage [/.read /.write] + (try.else false it)))) + (in (do async.monad + [it (do /.monad + [.let [[channel sink] (/.channel [])] + _ (/.close sink) + it (/.try (/.write expected sink))] + (in (when it + {try.#Failure _} + true + + _ + false)))] + (unit.coverage [/.close /.try] + (try.else false it)))) + (in (do async.monad + [it (do /.monad + [.let [[channel sink] (/.channel [])] + _ (/.close sink) + it (/.try (/.read channel))] + (in (when it + {try.#Failure error} + (exception.match? /.channel_has_been_closed error) + + _ + false)))] + (unit.coverage [/.channel_has_been_closed] + (try.else false it)))) + )))) diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux index d76cbe5a5..9d6844441 100644 --- a/stdlib/source/test/lux/math/number/frac.lux +++ b/stdlib/source/test/lux/math/number/frac.lux @@ -275,7 +275,7 @@ (def .public test Test (<| (_.covering /._) - (_.for [.Frac]) + (_.for [.Frac .F64 .Double]) (all _.and (do random.monad [left random.safe_frac diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux index 408e3f92c..d04d4dba0 100644 --- a/stdlib/source/test/lux/world/input/keyboard.lux +++ b/stdlib/source/test/lux/world/input/keyboard.lux @@ -155,7 +155,7 @@ )) - (_.for [/.Press] + (_.for [/.Press /.#input /.#pressed?] (`` (all _.and (,, (with_template [ ] [(do random.monad diff --git a/stdlib/source/test/lux/world/net.lux b/stdlib/source/test/lux/world/net.lux index f0c4acb39..252c6e077 100644 --- a/stdlib/source/test/lux/world/net.lux +++ b/stdlib/source/test/lux/world/net.lux @@ -12,6 +12,7 @@ ["[0]" / ["[1][0]" http ["[1]/[0]" client] + ["[1]/[0]" header] ["[1]/[0]" status] ["[1]/[0]" version]] ["[1][0]" uri @@ -33,6 +34,7 @@ true) /http/client.test + /http/header.test /http/status.test /http/version.test diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux index aa8ed3b58..ce0a35e93 100644 --- a/stdlib/source/test/lux/world/net/http/client.lux +++ b/stdlib/source/test/lux/world/net/http/client.lux @@ -29,6 +29,7 @@ [\\library ["[0]" / (.only) ["/[1]" // (.only) + ["[0]" header] ["[1][0]" status]]]]) (def (verification ! expected response) @@ -102,7 +103,7 @@ (`` (all _.and (,, (with_template [ ] [(_.coverage [] - (|> ( "" //.empty {.#None} mock) + (|> ( "" header.empty {.#None} mock) (verification io.monad ) io.run!))] @@ -117,7 +118,7 @@ (in (do [! async.monad] [.let [mock (/.async mock)] (,, (with_template [ ] - [ (|> ( "" //.empty {.#None} mock) + [ (|> ( "" header.empty {.#None} mock) (verification ! ))] ))] diff --git a/stdlib/source/test/lux/world/net/http/header.lux b/stdlib/source/test/lux/world/net/http/header.lux new file mode 100644 index 000000000..6a3c48a99 --- /dev/null +++ b/stdlib/source/test/lux/world/net/http/header.lux @@ -0,0 +1,73 @@ +(.require + [library + [lux (.except) + [abstract + [monad (.only do)]] + [control + ["|" pipe] + ["[0]" try (.use "[1]#[0]" functor)] + ["[0]" exception]] + [data + ["[0]" text (.use "[1]#[0]" equivalence)]] + [math + ["[0]" random (.only Random) (.use "[1]#[0]" monad)] + [number + ["[0]" nat (.use "[1]#[0]" equivalence)]]] + [test + ["_" property (.only Test)]]]] + [\\library + ["[0]" / (.only) + [// + ["[0]" mime (.use "[1]#[0]" equivalence)]]]]) + +(def .public test + Test + (<| (_.covering /._) + (do [! random.monad] + [expected_content_length random.nat + expected_content_type (random.either (random#in mime.javascript) + (random#in mime.jpeg)) + expected_location (random.either (random#in "http://example.com/yolo") + (random#in "http://example.com/meme")) + header_name (random.lower_case 1) + expected_header_value (random.upper_case 1) + .let [header (is (/.Header Text) + [/.#name header_name + /.#in (|>>) + /.#out (|>> {try.#Success})])]]) + (all _.and + (_.coverage [/.Headers /.empty /.unknown] + (|> /.empty + (/.one header) + (|.when + {try.#Success _} + false + + {try.#Failure error} + (exception.match? /.unknown error)))) + (_.coverage [/.Header /.#name /.#in /.#out + /.has /.one] + (|> /.empty + (/.has header expected_header_value) + (/.one header) + (try#each (same? expected_header_value)) + (try.else false))) + (_.coverage [/.content_length] + (|> /.empty + (/.has /.content_length expected_content_length) + (/.one /.content_length) + (try#each (nat#= expected_content_length)) + (try.else false))) + (_.coverage [/.content_type] + (|> /.empty + (/.has /.content_type expected_content_type) + (/.one /.content_type) + (try#each (mime#= expected_content_type)) + (try.else false))) + (_.coverage [/.location] + (|> /.empty + (/.has /.location expected_location) + (/.one /.location) + (try#each (text#= expected_location)) + (try.else false))) + ))) diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux index e155c44a0..f2522222a 100644 --- a/stdlib/source/test/lux/world/net/http/status.lux +++ b/stdlib/source/test/lux/world/net/http/status.lux @@ -113,6 +113,7 @@ (def .public test Test (<| (_.covering /._) + (_.for [/.Status]) (`` (.all _.and (,, (with_template [ ] [] -- cgit v1.2.3