summaryrefslogtreecommitdiff
path: root/js/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-10-24 10:39:36 +0200
committerJose <jose@zeroc.com>2018-10-24 10:40:38 +0200
commite0957c940dd1e2c3507ac25e8124a68a42d7595f (patch)
tree3d595f0fa9e2421730d2a5db9dadf0480956bd00 /js/test
parentFixed flushBatchRequests metrics bug, fixes #257 (diff)
downloadice-e0957c940dd1e2c3507ac25e8124a68a42d7595f.tar.bz2
ice-e0957c940dd1e2c3507ac25e8124a68a42d7595f.tar.xz
ice-e0957c940dd1e2c3507ac25e8124a68a42d7595f.zip
Fix JavaScript Ice/objects test failures
Diffstat (limited to 'js/test')
-rw-r--r--js/test/Ice/objects/Client.js16
-rw-r--r--js/test/Ice/objects/InitialI.js5
2 files changed, 13 insertions, 8 deletions
diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js
index abe7f76c3d5..87478d115a5 100644
--- a/js/test/Ice/objects/Client.js
+++ b/js/test/Ice/objects/Client.js
@@ -448,14 +448,14 @@
out.write("testing class containing complex dictionary... ");
{
- let m = new Test.M();
- m.v = new Test.MMap();
- let k1 = new Test.StructKey(1, "1");
- m.v.put(k1, new Test.L("one"));
- let k2 = new Test.StructKey(2, "2");
- m.v.put(k2, new L("two"));
+ const m = new Test.M();
+ m.v = new Test.LMap();
+ const k1 = new Test.StructKey(1, "1");
+ m.v.set(k1, new Test.L("one"));
+ const k2 = new Test.StructKey(2, "2");
+ m.v.set(k2, new Test.L("two"));
- let [m1, m2] = initial.opM(m);
+ const [m1, m2] = await initial.opM(m);
test(m1.v.size == 2);
test(m2.v.size == 2);
@@ -467,7 +467,7 @@
test(m2.v.get(k2).data == "two");
}
- out.println("ok");
+ out.writeLine("ok");
await initial.shutdown();
}
diff --git a/js/test/Ice/objects/InitialI.js b/js/test/Ice/objects/InitialI.js
index 7a014339f9d..77108624f7f 100644
--- a/js/test/Ice/objects/InitialI.js
+++ b/js/test/Ice/objects/InitialI.js
@@ -322,6 +322,11 @@
throw new Test.Inner.Sub.Ex("Inner::Sub::Ex");
}
+ opM(v1, current)
+ {
+ return [v1, v1];
+ }
+
shutdown(current)
{
current.adapter.getCommunicator().shutdown();