Skip to content

Commit d1acc3f

Browse files
MattCainMattCain
committed
Add tests for result callback
1 parent 7103dcd commit d1acc3f

File tree

5 files changed

+105
-68
lines changed

5 files changed

+105
-68
lines changed

‎test/coverage/__root__/annyang.js.html‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -811,37 +811,37 @@ <h1>
811811
<span class="cline-any cline-yes">1×</span>
812812
<span class="cline-any cline-yes">1×</span>
813813
<span class="cline-any cline-yes">1×</span>
814-
<span class="cline-any cline-yes">77×</span>
814+
<span class="cline-any cline-yes">79×</span>
815815
<span class="cline-any cline-neutral">&nbsp;</span>
816816
<span class="cline-any cline-neutral">&nbsp;</span>
817817
<span class="cline-any cline-yes">28×</span>
818818
<span class="cline-any cline-neutral">&nbsp;</span>
819819
<span class="cline-any cline-neutral">&nbsp;</span>
820820
<span class="cline-any cline-neutral">&nbsp;</span>
821-
<span class="cline-any cline-yes">77×</span>
821+
<span class="cline-any cline-yes">79×</span>
822822
<span class="cline-any cline-neutral">&nbsp;</span>
823823
<span class="cline-any cline-neutral">&nbsp;</span>
824824
<span class="cline-any cline-neutral">&nbsp;</span>
825825
<span class="cline-any cline-yes">1×</span>
826-
<span class="cline-any cline-yes">209×</span>
827-
<span class="cline-any cline-yes">209×</span>
828-
<span class="cline-any cline-yes">351×</span>
826+
<span class="cline-any cline-yes">217×</span>
827+
<span class="cline-any cline-yes">217×</span>
828+
<span class="cline-any cline-yes">390×</span>
829829
<span class="cline-any cline-neutral">&nbsp;</span>
830830
<span class="cline-any cline-neutral">&nbsp;</span>
831831
<span class="cline-any cline-neutral">&nbsp;</span>
832832
<span class="cline-any cline-yes">1×</span>
833-
<span class="cline-any cline-yes">107×</span>
833+
<span class="cline-any cline-yes">111×</span>
834834
<span class="cline-any cline-neutral">&nbsp;</span>
835835
<span class="cline-any cline-neutral">&nbsp;</span>
836836
<span class="cline-any cline-yes">1×</span>
837-
<span class="cline-any cline-yes">107×</span>
837+
<span class="cline-any cline-yes">111×</span>
838838
<span class="cline-any cline-yes">1×</span>
839839
<span class="cline-any cline-neutral">&nbsp;</span>
840840
<span class="cline-any cline-neutral">&nbsp;</span>
841841
<span class="cline-any cline-neutral">&nbsp;</span>
842842
<span class="cline-any cline-yes">1×</span>
843-
<span class="cline-any cline-yes">87×</span>
844-
<span class="cline-any cline-yes">87×</span>
843+
<span class="cline-any cline-yes">89×</span>
844+
<span class="cline-any cline-yes">89×</span>
845845
<span class="cline-any cline-yes">6×</span>
846846
<span class="cline-any cline-neutral">&nbsp;</span>
847847
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -897,8 +897,8 @@ <h1>
897897
<span class="cline-any cline-yes">1×</span>
898898
<span class="cline-any cline-neutral">&nbsp;</span>
899899
<span class="cline-any cline-yes">1×</span>
900-
<span class="cline-any cline-yes">41×</span>
901-
<span class="cline-any cline-yes">41×</span>
900+
<span class="cline-any cline-yes">43×</span>
901+
<span class="cline-any cline-yes">43×</span>
902902
<span class="cline-any cline-neutral">&nbsp;</span>
903903
<span class="cline-any cline-neutral">&nbsp;</span>
904904
<span class="cline-any cline-yes">1×</span>
@@ -922,10 +922,10 @@ <h1>
922922
<span class="cline-any cline-neutral">&nbsp;</span>
923923
<span class="cline-any cline-neutral">&nbsp;</span>
924924
<span class="cline-any cline-yes">1×</span>
925-
<span class="cline-any cline-yes">40×</span>
926-
<span class="cline-any cline-yes">40×</span>
925+
<span class="cline-any cline-yes">42×</span>
926+
<span class="cline-any cline-yes">42×</span>
927927
<span class="cline-any cline-neutral">&nbsp;</span>
928-
<span class="cline-any cline-yes">40×</span>
928+
<span class="cline-any cline-yes">42×</span>
929929
<span class="cline-any cline-neutral">&nbsp;</span>
930930
<span class="cline-any cline-no">&nbsp;</span>
931931
<span class="cline-any cline-no">&nbsp;</span>
@@ -937,51 +937,51 @@ <h1>
937937
<span class="cline-any cline-neutral">&nbsp;</span>
938938
<span class="cline-any cline-neutral">&nbsp;</span>
939939
<span class="cline-any cline-yes">1×</span>
940-
<span class="cline-any cline-yes">65×</span>
940+
<span class="cline-any cline-yes">67×</span>
941941
<span class="cline-any cline-yes">1×</span>
942942
<span class="cline-any cline-no">&nbsp;</span>
943943
<span class="cline-any cline-neutral">&nbsp;</span>
944944
<span class="cline-any cline-yes">1×</span>
945945
<span class="cline-any cline-neutral">&nbsp;</span>
946946
<span class="cline-any cline-neutral">&nbsp;</span>
947947
<span class="cline-any cline-neutral">&nbsp;</span>
948-
<span class="cline-any cline-yes">64×</span>
949-
<span class="cline-any cline-yes">64×</span>
950-
<span class="cline-any cline-yes">64×</span>
951-
<span class="cline-any cline-yes">320×</span>
948+
<span class="cline-any cline-yes">66×</span>
949+
<span class="cline-any cline-yes">66×</span>
950+
<span class="cline-any cline-yes">66×</span>
951+
<span class="cline-any cline-yes">330×</span>
952952
<span class="cline-any cline-neutral">&nbsp;</span>
953953
<span class="cline-any cline-neutral">&nbsp;</span>
954-
<span class="cline-any cline-yes">64×</span>
955-
<span class="cline-any cline-yes">64×</span>
954+
<span class="cline-any cline-yes">66×</span>
955+
<span class="cline-any cline-yes">66×</span>
956956
<span class="cline-any cline-neutral">&nbsp;</span>
957-
<span class="cline-any cline-yes">64×</span>
957+
<span class="cline-any cline-yes">66×</span>
958958
<span class="cline-any cline-neutral">&nbsp;</span>
959-
<span class="cline-any cline-yes">133×</span>
960-
<span class="cline-any cline-yes">133×</span>
959+
<span class="cline-any cline-yes">139×</span>
960+
<span class="cline-any cline-yes">139×</span>
961961
<span class="cline-any cline-no">&nbsp;</span>
962962
<span class="cline-any cline-neutral">&nbsp;</span>
963963
<span class="cline-any cline-neutral">&nbsp;</span>
964964
<span class="cline-any cline-neutral">&nbsp;</span>
965-
<span class="cline-any cline-yes">133×</span>
966-
<span class="cline-any cline-yes">237×</span>
967-
<span class="cline-any cline-yes">237×</span>
968-
<span class="cline-any cline-yes">237×</span>
969-
<span class="cline-any cline-yes">47×</span>
970-
<span class="cline-any cline-yes">47×</span>
965+
<span class="cline-any cline-yes">139×</span>
966+
<span class="cline-any cline-yes">243×</span>
967+
<span class="cline-any cline-yes">243×</span>
968+
<span class="cline-any cline-yes">243×</span>
969+
<span class="cline-any cline-yes">48×</span>
970+
<span class="cline-any cline-yes">48×</span>
971971
<span class="cline-any cline-no">&nbsp;</span>
972972
<span class="cline-any cline-no">&nbsp;</span>
973973
<span class="cline-any cline-no">&nbsp;</span>
974974
<span class="cline-any cline-neutral">&nbsp;</span>
975975
<span class="cline-any cline-neutral">&nbsp;</span>
976976
<span class="cline-any cline-neutral">&nbsp;</span>
977-
<span class="cline-any cline-yes">47×</span>
978-
<span class="cline-any cline-yes">47×</span>
979-
<span class="cline-any cline-yes">47×</span>
977+
<span class="cline-any cline-yes">48×</span>
978+
<span class="cline-any cline-yes">48×</span>
979+
<span class="cline-any cline-yes">48×</span>
980980
<span class="cline-any cline-neutral">&nbsp;</span>
981981
<span class="cline-any cline-neutral">&nbsp;</span>
982982
<span class="cline-any cline-neutral">&nbsp;</span>
983-
<span class="cline-any cline-yes">17×</span>
984-
<span class="cline-any cline-yes">17×</span>
983+
<span class="cline-any cline-yes">18×</span>
984+
<span class="cline-any cline-yes">18×</span>
985985
<span class="cline-any cline-neutral">&nbsp;</span>
986986
<span class="cline-any cline-neutral">&nbsp;</span>
987987
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -1012,21 +1012,21 @@ <h1>
10121012
<span class="cline-any cline-neutral">&nbsp;</span>
10131013
<span class="cline-any cline-neutral">&nbsp;</span>
10141014
<span class="cline-any cline-neutral">&nbsp;</span>
1015-
<span class="cline-any cline-yes">48×</span>
1016-
<span class="cline-any cline-yes">48×</span>
1017-
<span class="cline-any cline-yes">48×</span>
1018-
<span class="cline-any cline-yes">48×</span>
1015+
<span class="cline-any cline-yes">50×</span>
1016+
<span class="cline-any cline-yes">50×</span>
1017+
<span class="cline-any cline-yes">50×</span>
1018+
<span class="cline-any cline-yes">50×</span>
10191019
<span class="cline-any cline-no">&nbsp;</span>
10201020
<span class="cline-any cline-neutral">&nbsp;</span>
1021-
<span class="cline-any cline-yes">48×</span>
1021+
<span class="cline-any cline-yes">50×</span>
10221022
<span class="cline-any cline-neutral">&nbsp;</span>
1023-
<span class="cline-any cline-yes">48×</span>
1023+
<span class="cline-any cline-yes">50×</span>
10241024
<span class="cline-any cline-no">&nbsp;</span>
10251025
<span class="cline-any cline-neutral">&nbsp;</span>
10261026
<span class="cline-any cline-neutral">&nbsp;</span>
1027-
<span class="cline-any cline-yes">48×</span>
1028-
<span class="cline-any cline-yes">48×</span>
1029-
<span class="cline-any cline-yes">48×</span>
1027+
<span class="cline-any cline-yes">50×</span>
1028+
<span class="cline-any cline-yes">50×</span>
1029+
<span class="cline-any cline-yes">50×</span>
10301030
<span class="cline-any cline-neutral">&nbsp;</span>
10311031
<span class="cline-any cline-yes">7×</span>
10321032
<span class="cline-any cline-yes">1×</span>
@@ -1043,9 +1043,9 @@ <h1>
10431043
<span class="cline-any cline-neutral">&nbsp;</span>
10441044
<span class="cline-any cline-neutral">&nbsp;</span>
10451045
<span class="cline-any cline-neutral">&nbsp;</span>
1046-
<span class="cline-any cline-yes">74×</span>
1047-
<span class="cline-any cline-yes">74×</span>
1048-
<span class="cline-any cline-yes">74×</span>
1046+
<span class="cline-any cline-yes">76×</span>
1047+
<span class="cline-any cline-yes">76×</span>
1048+
<span class="cline-any cline-yes">76×</span>
10491049
<span class="cline-any cline-neutral">&nbsp;</span>
10501050
<span class="cline-any cline-neutral">&nbsp;</span>
10511051
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -1078,8 +1078,8 @@ <h1>
10781078
<span class="cline-any cline-neutral">&nbsp;</span>
10791079
<span class="cline-any cline-neutral">&nbsp;</span>
10801080
<span class="cline-any cline-neutral">&nbsp;</span>
1081-
<span class="cline-any cline-yes">54×</span>
1082-
<span class="cline-any cline-yes">53×</span>
1081+
<span class="cline-any cline-yes">56×</span>
1082+
<span class="cline-any cline-yes">55×</span>
10831083
<span class="cline-any cline-neutral">&nbsp;</span>
10841084
<span class="cline-any cline-yes">1×</span>
10851085
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -1115,16 +1115,16 @@ <h1>
11151115
<span class="cline-any cline-neutral">&nbsp;</span>
11161116
<span class="cline-any cline-neutral">&nbsp;</span>
11171117
<span class="cline-any cline-neutral">&nbsp;</span>
1118-
<span class="cline-any cline-yes">57×</span>
1118+
<span class="cline-any cline-yes">59×</span>
11191119
<span class="cline-any cline-neutral">&nbsp;</span>
1120-
<span class="cline-any cline-yes">57×</span>
1120+
<span class="cline-any cline-yes">59×</span>
11211121
<span class="cline-any cline-neutral">&nbsp;</span>
1122-
<span class="cline-any cline-yes">57×</span>
1123-
<span class="cline-any cline-yes">88×</span>
1124-
<span class="cline-any cline-yes">88×</span>
1125-
<span class="cline-any cline-yes">88×</span>
1122+
<span class="cline-any cline-yes">59×</span>
1123+
<span class="cline-any cline-yes">90×</span>
1124+
<span class="cline-any cline-yes">90×</span>
1125+
<span class="cline-any cline-yes">90×</span>
11261126
<span class="cline-any cline-neutral">&nbsp;</span>
1127-
<span class="cline-any cline-yes">77×</span>
1127+
<span class="cline-any cline-yes">79×</span>
11281128
<span class="cline-any cline-yes">11×</span>
11291129
<span class="cline-any cline-neutral">&nbsp;</span>
11301130
<span class="cline-any cline-yes">10×</span>
@@ -1161,9 +1161,9 @@ <h1>
11611161
<span class="cline-any cline-neutral">&nbsp;</span>
11621162
<span class="cline-any cline-neutral">&nbsp;</span>
11631163
<span class="cline-any cline-neutral">&nbsp;</span>
1164-
<span class="cline-any cline-yes">57×</span>
1165-
<span class="cline-any cline-yes">50×</span>
1166-
<span class="cline-any cline-yes">50×</span>
1164+
<span class="cline-any cline-yes">59×</span>
1165+
<span class="cline-any cline-yes">52×</span>
1166+
<span class="cline-any cline-yes">52×</span>
11671167
<span class="cline-any cline-neutral">&nbsp;</span>
11681168
<span class="cline-any cline-yes">7×</span>
11691169
<span class="cline-any cline-yes">7×</span>
@@ -1216,14 +1216,14 @@ <h1>
12161216
<span class="cline-any cline-neutral">&nbsp;</span>
12171217
<span class="cline-any cline-neutral">&nbsp;</span>
12181218
<span class="cline-any cline-neutral">&nbsp;</span>
1219-
<span class="cline-any cline-yes">40×</span>
1219+
<span class="cline-any cline-yes">42×</span>
12201220
<span class="cline-any cline-yes">2×</span>
12211221
<span class="cline-any cline-neutral">&nbsp;</span>
1222-
<span class="cline-any cline-yes">38×</span>
1223-
<span class="cline-any cline-yes">38×</span>
1222+
<span class="cline-any cline-yes">40×</span>
1223+
<span class="cline-any cline-yes">40×</span>
12241224
<span class="cline-any cline-no">&nbsp;</span>
12251225
<span class="cline-any cline-neutral">&nbsp;</span>
1226-
<span class="cline-any cline-yes">38×</span>
1226+
<span class="cline-any cline-yes">40×</span>
12271227
<span class="cline-any cline-neutral">&nbsp;</span>
12281228
<span class="cline-any cline-neutral">&nbsp;</span>
12291229
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -1299,7 +1299,7 @@ <h1>
12991299
<span class="cline-any cline-neutral">&nbsp;</span>
13001300
<span class="cline-any cline-neutral">&nbsp;</span>
13011301
<span class="cline-any cline-neutral">&nbsp;</span>
1302-
<span class="cline-any cline-yes">50×</span>
1302+
<span class="cline-any cline-yes">52×</span>
13031303
<span class="cline-any cline-neutral">&nbsp;</span>
13041304
<span class="cline-any cline-neutral">&nbsp;</span>
13051305
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -2194,7 +2194,7 @@ <h1>
21942194
</div><!-- /wrapper -->
21952195
<div class='footer quiet pad2 space-top1 center small'>
21962196
Code coverage
2197-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Feb 01 2016 10:16:36 GMT+0100 (CET)
2197+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Feb 03 2016 12:04:39 GMT+0000 (GMT)
21982198
</div>
21992199
</div>
22002200
<script src="../prettify.js"></script>

‎test/coverage/__root__/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h1>
7777
</div><!-- /wrapper -->
7878
<div class='footer quiet pad2 space-top1 center small'>
7979
Code coverage
80-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Feb 01 2016 10:16:36 GMT+0100 (CET)
80+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Feb 03 2016 12:04:39 GMT+0000 (GMT)
8181
</div>
8282
</div>
8383
<script src="../prettify.js"></script>

‎test/coverage/coverage.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎test/coverage/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h1>
7777
</div><!-- /wrapper -->
7878
<div class='footer quiet pad2 space-top1 center small'>
7979
Code coverage
80-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Feb 01 2016 10:16:36 GMT+0100 (CET)
80+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Feb 03 2016 12:04:39 GMT+0000 (GMT)
8181
</div>
8282
</div>
8383
<script src="prettify.js"></script>

‎test/spec/BasicSpec.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,43 @@
388388

389389
});
390390

391+
describe("annyang.addCallback('result')", function() {
392+
393+
var recognition;
394+
var spyOnResult;
395+
var spyOnCommand;
396+
397+
beforeEach(function() {
398+
annyang.debug(false);
399+
recognition = annyang.getSpeechRecognizer();
400+
spyOnResult = jasmine.createSpy();
401+
spyOnCommand = jasmine.createSpy();
402+
annyang.abort();
403+
annyang.start();
404+
annyang.removeCommands();
405+
annyang.addCommands({
406+
'Time for some thrilling heroics': spyOnCommand
407+
});
408+
});
409+
410+
it('should add a callback which will be called when result returned from Speech Recognition and a command was matched', function() {
411+
annyang.addCallback('result', spyOnResult);
412+
expect(spyOnResult).not.toHaveBeenCalled();
413+
recognition.say('Time for some thrilling heroics');
414+
expect(spyOnResult).toHaveBeenCalledTimes(1);
415+
expect(spyOnCommand).toHaveBeenCalledTimes(1);
416+
});
417+
418+
it('should add a callback which will be called when result returned from Speech Recognition and a command was not matched', function() {
419+
annyang.addCallback('result', spyOnResult);
420+
expect(spyOnResult).not.toHaveBeenCalled();
421+
recognition.say('That sounds like something out of science fiction');
422+
expect(spyOnResult).toHaveBeenCalledTimes(1);
423+
expect(spyOnCommand).not.toHaveBeenCalled();
424+
});
425+
426+
});
427+
391428
describe('annyang.removeCallback', function() {
392429

393430
var spy1;

0 commit comments

Comments
 (0)