Skip to content

Commit

Permalink
Update README.md : Example of resolve by signal and binary expression
Browse files Browse the repository at this point in the history
  • Loading branch information
benlau committed Jul 16, 2015
1 parent a66cfeb commit 309b70d
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 1 deletion.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,5 +243,18 @@ Promise {
```

2. Resolve by signal and binary expression
------------------------------------------

```
Promise {
resolveWhen: Q.all([timer.triggered, promise2]);
Promise {
id : promise2
resolveWhen: image.status === Image.Ready
}
}
```

44 changes: 44 additions & 0 deletions tests/unittests/tst_promise_resolvewhen_all_promise.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import QtQuick 2.0
import QtTest 1.0
import QuickPromise 1.0

TestSuite {
name : "Promise_ResolveWhen_All_Promise"

Component {
id: promiseCreator;
Promise {
id : promise
signal triggered
property alias promise1 : promiseItem1
property alias promise2 : promiseItem2
resolveWhen: Q.all([promise1,promise2,promise.triggered])
Promise {
id: promiseItem1
}
Promise {
id: promiseItem2
}
}
}

function test_resolve() {
var promise = promiseCreator.createObject();
compare(promise.isSettled,false);
tick();
compare(promise.isSettled,false);

promise.triggered();
compare(promise.isSettled,false);
tick();
compare(promise.isSettled,false);

promise.promise1.resolve();
promise.promise2.resolve();
compare(promise.isSettled,false);

tick();
compare(promise.isSettled,true);
}
}

3 changes: 2 additions & 1 deletion tests/unittests/unittests.pro
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ DISTFILES += \
tst_promisejs_all_promise_item.qml \
tst_promise_resolvewhen_promise.qml \
TestSuite.qml \
tst_promise_resolvewhen_all_signal.qml
tst_promise_resolvewhen_all_signal.qml \
tst_promise_resolvewhen_all_promise.qml

0 comments on commit 309b70d

Please sign in to comment.