Better collocation optimization, fix for ICE-5489, ICE-5484

1 files changed, 11 insertions, 2 deletions

diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index 523b2db52dd..6f11847a2f7 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -20,12 +20,13 @@ run(int, char**, const Ice::CommunicatorPtr& communicator,
     const Ice::InitializationData&)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
+    communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
 
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
-    allTests(communicator, true);
+    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
+    allTests(communicator);
 
     return EXIT_SUCCESS;
 }
@@ -40,6 +41,14 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
+
+        //
+        // We must set MessageSizeMax to an explicit values, because
+        // we run tests to check whether Ice.MemoryLimitException is
+        // raised as expected.
+        //
+        initData.properties->setProperty("Ice.MessageSizeMax", "100");
+
         communicator = Ice::initialize(argc, argv, initData);
         status = run(argc, argv, communicator, initData);
     }