summaryrefslogtreecommitdiff
path: root/js/test/Ice/acm/Client.js
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-09-14 15:43:34 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-09-14 15:43:34 +0200
commit13bed6dec104b53fadf723aead0dc15dc3f2afd8 (patch)
treed6401dbe7d70d65e04e448439e4056c1fa4d7e8c /js/test/Ice/acm/Client.js
parentRemoved ARM configuraton from WinRT testsuite solutions (diff)
downloadice-13bed6dec104b53fadf723aead0dc15dc3f2afd8.tar.bz2
ice-13bed6dec104b53fadf723aead0dc15dc3f2afd8.tar.xz
ice-13bed6dec104b53fadf723aead0dc15dc3f2afd8.zip
Fixed ICE-6812 - JavaScript ACM monitor bug
Diffstat (limited to 'js/test/Ice/acm/Client.js')
-rw-r--r--js/test/Ice/acm/Client.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js
index 25ab4cbcd6c..65628559651 100644
--- a/js/test/Ice/acm/Client.js
+++ b/js/test/Ice/acm/Client.js
@@ -402,7 +402,7 @@
__init__: function(com, out)
{
TestCase.call(this, "setACM/getACM", com, out);
- this.setClientACM(15, 4, 2);
+ this.setClientACM(15, 4, 0);
},
runTestCase: function(adapter, proxy)
{
@@ -410,23 +410,23 @@
acm = proxy.ice_getCachedConnection().getACM();
test(acm.timeout === 15);
test(acm.close === Ice.ACMClose.CloseOnIdleForceful);
- test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOnIdle);
+ test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOff);
proxy.ice_getCachedConnection().setACM(undefined, undefined, undefined);
acm = proxy.ice_getCachedConnection().getACM();
test(acm.timeout === 15);
test(acm.close === Ice.ACMClose.CloseOnIdleForceful);
- test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOnIdle);
+ test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOff);
- proxy.ice_getCachedConnection().setACM(20,
+ proxy.ice_getCachedConnection().setACM(1,
Ice.ACMClose.CloseOnInvocationAndIdle,
- Ice.ACMHeartbeat.HeartbeatOnInvocation);
+ Ice.ACMHeartbeat.HeartbeatAlways);
acm = proxy.ice_getCachedConnection().getACM();
- test(acm.timeout === 20);
+ test(acm.timeout === 1);
test(acm.close === Ice.ACMClose.CloseOnInvocationAndIdle);
- test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOnInvocation);
+ test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatAlways);
- return new Ice.Promise().succeed();
+ return proxy.waitForHeartbeat(2);
}
});