Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
quasar-network
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jens Nolte
quasar-network
Commits
caf1de4b
Commit
caf1de4b
authored
3 years ago
by
Jens Nolte
Browse files
Options
Downloads
Patches
Plain Diff
Add stub generator and tests for Observable
Co-authored-by:
Jan Beinke
<
git@janbeinke.com
>
parent
deeca79f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Quasar/Network/TH.hs
+9
-3
9 additions, 3 deletions
src/Quasar/Network/TH.hs
test/Quasar/NetworkSpec.hs
+37
-3
37 additions, 3 deletions
test/Quasar/NetworkSpec.hs
with
46 additions
and
6 deletions
src/Quasar/Network/TH.hs
+
9
−
3
View file @
caf1de4b
...
...
@@ -363,7 +363,7 @@ data RequestHandlerContext = RequestHandlerContext {
generateObservable
::
RpcApi
->
RpcObservable
->
Q
Code
generateObservable
api
observable
=
pure
Code
{
clientStubDecs
=
[]
,
clientStubDecs
=
observableStubDec
,
requests
=
[
observeRequest
,
retrieveRequest
],
serverImplFields
=
[
varDefaultBangType
serverImplFieldName
serverImplFieldSig
]
}
...
...
@@ -390,14 +390,20 @@ generateObservable api observable = pure Code {
fields
=
[
Field
"result"
observable
.
ty
]
}
serverImplFieldName
::
Name
serverImplFieldName
=
mkName
observable
.
name
serverImplFieldName
=
mkName
(
observable
.
name
<>
"Impl"
)
serverImplFieldSig
::
Q
Type
serverImplFieldSig
=
[
t
|
Observable $(observable.ty)
|]
observableE
::
RequestHandlerContext
->
Q
Exp
observableE
ctx
=
[
|$
(
varE
serverImplFieldName
)
$
(
ctx
.
implRecordE
)
|
]
observableStubDec
::
[
Q
Dec
]
observableStubDec
=
[
sigD
(
mkName
observable
.
name
)
[
t
|
$(clientType api) -> Observable $(observable.ty)
|]
sigD
(
mkName
observable
.
name
)
[
t
|
$(clientType api) -> IO (Observable $(observable.ty))
|]
,
do
clientName
<-
newName
"client"
let
clientE
=
varE
clientName
funD
(
mkName
observable
.
name
)
[
clause
[
varP
clientName
]
(
normalB
[
|
newObservableStub
(
$
(
clientRequestStubE
api
retrieveRequest
)
$
clientE
)
(
$
(
clientRequestStubE
api
observeRequest
)
$
clientE
)
|
])
[]
]
]
observeE
::
Q
Exp
observeE
=
clientRequestStubE
api
observeRequest
...
...
This diff is collapsed.
Click to expand it.
test/Quasar/NetworkSpec.hs
+
37
−
3
View file @
caf1de4b
...
...
@@ -11,19 +11,22 @@
module
Quasar.NetworkSpec
where
import
Control.Concurrent.MVar
import
Control.Concurrent.STM
import
Control.Exception
(
toException
)
import
Control.Monad.IO.Class
(
MonadIO
,
liftIO
)
import
Prelude
import
Quasar.
Prelude
import
Quasar.Awaitable
import
Quasar.Core
import
Quasar.Network
import
Quasar.Network.Runtime
(
withStandaloneClient
)
import
Quasar.Network.TH
(
makeRpc
)
import
Quasar.Observable
import
Test.Hspec
import
Test.QuickCheck
import
Test.QuickCheck.Monadic
shouldReturnAsync
::
(
HasCallStack
,
Show
a
,
Eq
a
)
=>
AsyncIO
a
->
a
->
AsyncIO
()
action
`
shouldReturnAsync
`
expected
=
action
>>=
liftIO
.
(`
shouldBe
`
expected
)
shouldReturnAsync
::
(
HasCallStack
,
IsAwaitable
r
a
,
Show
r
,
Eq
r
)
=>
AsyncIO
a
->
r
->
AsyncIO
()
action
`
shouldReturnAsync
`
expected
=
action
>>=
await
>>=
liftIO
.
(`
shouldBe
`
expected
)
$
(
makeRpc
$
rpcApi
"Example"
$
do
...
...
@@ -87,6 +90,7 @@ streamExampleProtocolImpl = StreamExampleProtocolImpl {
streamSetHandler
stream1
$
streamSend
stream1
streamSetHandler
stream2
$
streamSend
stream2
spec
::
Spec
spec
=
parallel
$
do
describe
"Example"
$
do
...
...
@@ -119,3 +123,33 @@ spec = parallel $ do
liftIO
$
streamSend
stream
(
x
,
y
)
liftIO
$
takeMVar
resultMVar
`
shouldReturn
`
x
*
y
describe
"ObservableExample"
$
do
it
"can retrieve values"
$
do
var
<-
newObservableVar
42
withStandaloneClient
@
ObservableExampleProtocol
(
ObservableExampleProtocolImpl
(
toObservable
var
))
$
\
client
->
do
observable
<-
intObservable
client
retrieveIO
observable
`
shouldReturn
`
42
setObservableVar
var
13
retrieveIO
observable
`
shouldReturn
`
13
it
"foobar"
$
do
var
<-
newObservableVar
42
withStandaloneClient
@
ObservableExampleProtocol
(
ObservableExampleProtocolImpl
(
toObservable
var
))
$
\
client
->
do
resultVar
<-
newTVarIO
ObservableLoading
observable
<-
intObservable
client
void
$
observe
observable
$
atomically
.
writeTVar
resultVar
let
latestShouldBe
=
\
expected
->
join
$
atomically
$
readTVar
resultVar
>>=
\
case
-- Network might be slow, so this retries until the expected value is received.
-- Blocks forever if the wrong or no value is received.
ObservableUpdate
x
->
if
(
x
==
expected
)
then
pure
(
pure
()
)
else
retry
ObservableLoading
->
retry
ObservableNotAvailable
ex
->
pure
$
throwIO
ex
latestShouldBe
42
setObservableVar
var
13
latestShouldBe
13
setObservableVar
var
(
-
1
)
latestShouldBe
(
-
1
)
setObservableVar
var
42
latestShouldBe
42
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment