- Cleaned up test/Ice/operations test

- Added test/Ice/ami test
- sent callback is now always called

1 files changed, 76 insertions, 0 deletions

diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp
new file mode 100644
index 00000000000..2b8b5cba674
--- /dev/null
+++ b/cpp/test/Ice/ami/Server.cpp
@@ -0,0 +1,76 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/Ice.h>
+#include <TestI.h>
+
+using namespace std;
+
+int
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+{
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011");
+    communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter");
+
+    TestIntfControllerIPtr testController = new TestIntfControllerI(adapter);
+    
+    adapter->add(new TestIntfI(), communicator->stringToIdentity("test"));
+    adapter->activate();
+    
+    adapter2->add(testController, communicator->stringToIdentity("testController"));
+    adapter2->activate();
+    
+    communicator->waitForShutdown();
+    return EXIT_SUCCESS;
+}
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+
+        //
+        // This test kills connections, so we don't want warnings.
+        //
+        initData.properties->setProperty("Ice.Warn.Connections", "0");
+
+        communicator = Ice::initialize(argc, argv, initData);
+        status = run(argc, argv, communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
+
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
+}