diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/Ice/PropertyNames.js | 3 | ||||
| -rw-r--r-- | js/test/Ice/objects/Client.js | 17 | ||||
| -rw-r--r-- | js/test/Ice/objects/InitialI.js | 9 | ||||
| -rw-r--r-- | js/test/Ice/objects/Test.ice | 3 |
4 files changed, 31 insertions, 1 deletions
diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js index 4f198ec4f30..79e02bcad47 100644 --- a/js/src/Ice/PropertyNames.js +++ b/js/src/Ice/PropertyNames.js @@ -1,7 +1,7 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Sep 6 18:11:04 2019 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul 2 14:55:02 2020 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -14,6 +14,7 @@ const PropertyNames = {}; const Property = Ice.Property; PropertyNames.IceProps = [ + new Property("/^Ice\.AcceptClassCycles/", false, null), new Property("/^Ice\.ACM\.Client/", true, null), new Property("/^Ice\.ACM\.Server/", true, null), new Property("/^Ice\.ACM\.Timeout/", false, null), diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js index 0f5e5cb730b..76697dc3d17 100644 --- a/js/test/Ice/objects/Client.js +++ b/js/test/Ice/objects/Client.js @@ -491,6 +491,23 @@ } out.writeLine("ok"); + out.write("testing sending class cycle... "); + { + const rec = new Test.Recursive(); + rec.v = rec; + const acceptsCycles = await initial.acceptsClassCycles(); + try + { + await initial.setCycle(rec); + test(acceptsCycles); + } + catch (error) + { + test(!acceptsCycles); + } + } + out.writeLine("ok"); + await initial.shutdown(); } diff --git a/js/test/Ice/objects/InitialI.js b/js/test/Ice/objects/InitialI.js index e6140642963..c5c3d623b40 100644 --- a/js/test/Ice/objects/InitialI.js +++ b/js/test/Ice/objects/InitialI.js @@ -225,6 +225,15 @@ return false; } + setCycle(r, current) + { + } + + acceptsClassCycles(current) + { + return true; + } + getMB(current) { return this._b1; diff --git a/js/test/Ice/objects/Test.ice b/js/test/Ice/objects/Test.ice index 617deda65de..3f60df69a41 100644 --- a/js/test/Ice/objects/Test.ice +++ b/js/test/Ice/objects/Test.ice @@ -220,6 +220,9 @@ interface Initial void setRecursive(Recursive p); bool supportsClassGraphDepthMax(); + void setCycle(Recursive r); + bool acceptsClassCycles(); + ["marshaled-result"] B getMB(); ["amd", "marshaled-result"] B getAMDMB(); |