diff options
Diffstat (limited to 'js/test/Ice/objects/Client.js')
| -rw-r--r-- | js/test/Ice/objects/Client.js | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js index d4771b81742..a14a734c5b7 100644 --- a/js/test/Ice/objects/Client.js +++ b/js/test/Ice/objects/Client.js @@ -136,16 +136,7 @@ JI.prototype = new Test.J(); JI.prototype.constructor = JI; - var MyObjectFactory = function() - { - Ice.ObjectFactory.call(this); - }; - - MyObjectFactory.prototype = new Ice.ObjectFactory(); - - MyObjectFactory.prototype.constructor = MyObjectFactory; - - MyObjectFactory.prototype.create = function(type) + function MyValueFactory(type) { switch(type) { @@ -173,6 +164,20 @@ break; } return null; + } + + var MyObjectFactory = function() + { + Ice.ObjectFactory.call(this); + }; + + MyObjectFactory.prototype = new Ice.ObjectFactory(); + + MyObjectFactory.prototype.constructor = MyObjectFactory; + + MyObjectFactory.prototype.create = function(type) + { + return null; }; MyObjectFactory.prototype.destroy = function() @@ -203,17 +208,18 @@ Promise.try( function() { - var factory = new MyObjectFactory(); - communicator.addObjectFactory(factory, "::Test::B"); - communicator.addObjectFactory(factory, "::Test::C"); - communicator.addObjectFactory(factory, "::Test::D"); - communicator.addObjectFactory(factory, "::Test::E"); - communicator.addObjectFactory(factory, "::Test::F"); - communicator.addObjectFactory(factory, "::Test::I"); - communicator.addObjectFactory(factory, "::Test::J"); - communicator.addObjectFactory(factory, "::Test::H"); - communicator.addObjectFactory(factory, "::Test::Inner::A"); - communicator.addObjectFactory(factory, "::Test::Inner::Sub::A"); + communicator.addValueFactory(MyValueFactory, "::Test::B"); + communicator.addValueFactory(MyValueFactory, "::Test::C"); + communicator.addValueFactory(MyValueFactory, "::Test::D"); + communicator.addValueFactory(MyValueFactory, "::Test::E"); + communicator.addValueFactory(MyValueFactory, "::Test::F"); + communicator.addValueFactory(MyValueFactory, "::Test::I"); + communicator.addValueFactory(MyValueFactory, "::Test::J"); + communicator.addValueFactory(MyValueFactory, "::Test::H"); + communicator.addValueFactory(MyValueFactory, "::Test::Inner::A"); + communicator.addValueFactory(MyValueFactory, "::Test::Inner::Sub::A"); + + communicator.addObjectFactory(new MyObjectFactory(), "TestOF"); out.write("testing stringToProxy... "); ref = "initial:default -p 12010"; @@ -508,6 +514,14 @@ { test(ex.reason == "Inner::Sub::Ex"); out.writeLine("ok"); + + out.write("testing getting ObjectFactory... "); + test(communicator.findObjectFactory("TestOF") !== null); + out.writeLine("ok"); + out.write("testing getting ObjectFactory as ValueFactory... "); + test(communicator.findValueFactory("TestOF") !== null); + out.writeLine("ok"); + return initial.shutdown(); } ).then( |