Integrated minor test changes from Ice Touch branch

23 files changed, 213 insertions, 102 deletions

diff --git a/cpp/test/Ice/checksum/Client.cpp b/cpp/test/Ice/checksum/Client.cpp
index f7211dfe371..16b1a1cad75 100644
--- a/cpp/test/Ice/checksum/Client.cpp
+++ b/cpp/test/Ice/checksum/Client.cpp
@@ -13,6 +13,8 @@
 
 using namespace std;
 
+DEFINE_TEST("client")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
diff --git a/cpp/test/Ice/checksum/server/Server.cpp b/cpp/test/Ice/checksum/server/Server.cpp
index 9fc7059587e..ea8de80eff4 100644
--- a/cpp/test/Ice/checksum/server/Server.cpp
+++ b/cpp/test/Ice/checksum/server/Server.cpp
@@ -9,9 +9,12 @@
 
 #include <Ice/Ice.h>
 #include <TestI.h>
+#include <TestCommon.h>
 
 using namespace std;
 
+DEFINE_TEST("server")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -20,6 +23,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new ChecksumI();
     adapter->add(object, communicator->stringToIdentity("test"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp
index 32a27643519..7e0b3190441 100644
--- a/cpp/test/Ice/custom/Client.cpp
+++ b/cpp/test/Ice/custom/Client.cpp
@@ -14,6 +14,8 @@
 
 using namespace std;
 
+DEFINE_TEST("client")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp
index d8dd5ff6708..ae3c3e4a0af 100644
--- a/cpp/test/Ice/custom/Collocated.cpp
+++ b/cpp/test/Ice/custom/Collocated.cpp
@@ -15,6 +15,8 @@
 
 using namespace std;
 
+DEFINE_TEST("collocated")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp
index 0df0345f478..e0b0a2bdb68 100644
--- a/cpp/test/Ice/custom/Server.cpp
+++ b/cpp/test/Ice/custom/Server.cpp
@@ -15,6 +15,8 @@
 
 using namespace std;
 
+DEFINE_TEST("server")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -24,6 +26,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     adapter->add(new Test2::WstringClassI, communicator->stringToIdentity("wstring2"));
 
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
 
     return EXIT_SUCCESS;
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index 94eed611050..576837f039c 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -15,6 +15,8 @@
 
 using namespace std;
 
+DEFINE_TEST("serveramd")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -24,8 +26,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     adapter->add(new Test2::WstringClassI, communicator->stringToIdentity("wstring2"));
 
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
-
+    
     return EXIT_SUCCESS;
 }
 
diff --git a/cpp/test/Ice/defaultServant/Client.cpp b/cpp/test/Ice/defaultServant/Client.cpp
index ed6ad2991d3..d2ce3a19954 100644
--- a/cpp/test/Ice/defaultServant/Client.cpp
+++ b/cpp/test/Ice/defaultServant/Client.cpp
@@ -14,6 +14,8 @@
 using namespace std;
 using namespace Test;
 
+DEFINE_TEST("client")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
diff --git a/cpp/test/Ice/defaultValue/Client.cpp b/cpp/test/Ice/defaultValue/Client.cpp
index efa31e283c5..e7a209c787e 100644
--- a/cpp/test/Ice/defaultValue/Client.cpp
+++ b/cpp/test/Ice/defaultValue/Client.cpp
@@ -14,6 +14,8 @@
 using namespace std;
 using namespace Test;
 
+DEFINE_TEST("client")
+
 int
 run(int, char**)
 {
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp
index f278263b9ed..2ff52743958 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.cpp
+++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp
@@ -21,11 +21,6 @@ Dispatcher::Dispatcher()
     __setNoDelete(false);
 }
 
-Dispatcher::~Dispatcher()
-{
-    _instance = 0;
-}
-
 void
 Dispatcher::dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)
 {
@@ -47,6 +42,7 @@ Dispatcher::terminate()
     }
 
     _instance->getThreadControl().join();
+    _instance = 0;
 }
 
 bool
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h
index 082476ac202..cdcd4a0cce5 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.h
+++ b/cpp/test/Ice/dispatcher/Dispatcher.h
@@ -22,7 +22,6 @@ class Dispatcher : public Ice::Dispatcher, IceUtil::Thread, IceUtil::Monitor<Ice
 public:
 
     Dispatcher();
-    virtual ~Dispatcher();
 
     virtual void dispatch(const Ice::DispatcherCallPtr&, const Ice::ConnectionPtr&);
     
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index b5dc902f9e9..0b43272fa95 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -15,6 +15,8 @@
 #include <AMDInterceptorI.h>
 #include <iostream>
 
+DEFINE_TEST("client")
+
 #ifndef _WIN32
 //
 // SIGPIPE test
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index f58fcefd731..1b07571b822 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -779,8 +779,6 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 
                 Ice::Context combined = prxContext;
                 combined.insert(ctx.begin(), ctx.end());
-		cout << "ctx " << ctx["one"] << endl;
-		cout << "combined " << combined["one"] << endl;
                 test(combined["one"] == "UN");
                 
                 p = Test::MyClassPrx::uncheckedCast(p->ice_context(prxContext));
@@ -789,23 +787,6 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 test(p->opContext() == prxContext);
 
                 ic->getImplicitContext()->setContext(ctx);
-                cout << "ctx--------" << endl;
-                for(Ice::Context::const_iterator i = ctx.begin(); i != ctx.end(); ++i)
-                {
-                    cout << "combined: " << i->first << " : " << i->second << endl;
-                }
-
-                cout << "opContext--------" << endl;
-                Ice::Context opContext = p->opContext();
-                for(Ice::Context::const_iterator i = opContext.begin(); i != opContext.end(); ++i)
-                {
-                    cout << "combined: " << i->first << " : " << i->second << endl;
-                }
-                cout << "combined--------" << endl;
-                for(Ice::Context::const_iterator i = combined.begin(); i != combined.end(); ++i)
-                {
-                    cout << "combined: " << i->first << " : " << i->second << endl;
-                }
                 test(p->opContext() == combined);
 
                 test(ic->getImplicitContext()->remove("one") == "ONE");
diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp
index 280aefb5415..bed21b0a26d 100644
--- a/cpp/test/Ice/proxy/ServerAMD.cpp
+++ b/cpp/test/Ice/proxy/ServerAMD.cpp
@@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
-
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/servantLocator/Client.cpp b/cpp/test/Ice/servantLocator/Client.cpp
index b96494090bb..8f5d78d8b04 100644
--- a/cpp/test/Ice/servantLocator/Client.cpp
+++ b/cpp/test/Ice/servantLocator/Client.cpp
@@ -11,29 +11,51 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
-using namespace Ice;
 using namespace Test;
 
-class TestClient : public Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
 int
-main(int argc, char* argv[])
+run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    TestClient app;
-    return app.main(argc, argv);
+    TestIntfPrx allTests(const Ice::CommunicatorPtr&, bool);
+    TestIntfPrx obj = allTests(communicator, false);
+    obj->shutdown();
+    return EXIT_SUCCESS;
 }
 
 int
-TestClient::run(int, char**)
+main(int argc, char* argv[])
 {
-    TestIntfPrx allTests(const CommunicatorPtr&, bool);
-    TestIntfPrx obj = allTests(communicator(), false);
-    obj->shutdown();
-    return EXIT_SUCCESS;
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+        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;
 }
diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp
index 032ffbcc9c1..a5b49cfd1a1 100644
--- a/cpp/test/Ice/servantLocator/Collocated.cpp
+++ b/cpp/test/Ice/servantLocator/Collocated.cpp
@@ -13,6 +13,8 @@
 #include <Test.h>
 #include <TestI.h>
 
+DEFINE_TEST("collocated")
+
 using namespace std;
 using namespace Ice;
 
@@ -69,32 +71,53 @@ public:
     }
 };
 
-class TestServer : public Application
+int
+run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-public:
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    adapter->addServantLocator(new ServantLocatorI(""), "");
+    adapter->addServantLocator(new ServantLocatorI("category"), "category");
+    adapter->add(new TestI, communicator->stringToIdentity("asm"));
+    adapter->add(new TestActivationI, communicator->stringToIdentity("test/activation"));
 
-    virtual int run(int, char*[]);
-};
+    Test::TestIntfPrx allTests(const CommunicatorPtr&, bool);
+    allTests(communicator, true);
 
-int
-main(int argc, char* argv[])
-{
-    TestServer app;
-    return app.main(argc, argv);
+    return EXIT_SUCCESS;
 }
 
 int
-TestServer::run(int, char**)
+main(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
-    adapter->addServantLocator(new ServantLocatorI(""), "");
-    adapter->addServantLocator(new ServantLocatorI("category"), "category");
-    adapter->add(new TestI, communicator()->stringToIdentity("asm"));
-    adapter->add(new TestActivationI, communicator()->stringToIdentity("test/activation"));
+    int status;
+    Ice::CommunicatorPtr communicator;
 
-    Test::TestIntfPrx allTests(const CommunicatorPtr&, bool);
-    allTests(communicator(), true);
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+        communicator = Ice::initialize(argc, argv, initData);
+        status = run(argc, argv, communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
 
-    return EXIT_SUCCESS;
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
 }
diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp
index 756f862c6c2..2210be0d374 100644
--- a/cpp/test/Ice/servantLocator/Server.cpp
+++ b/cpp/test/Ice/servantLocator/Server.cpp
@@ -12,6 +12,8 @@
 #include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 using namespace Ice;
 
@@ -68,33 +70,55 @@ public:
     }
 };
 
-class TestServer : public Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
 int
-main(int argc, char* argv[])
+run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    TestServer app;
-    return app.main(argc, argv);
-}
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
+    communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
 
-int
-TestServer::run(int, char**)
-{
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
-    communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
-
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     
     adapter->addServantLocator(new ServantLocatorI(""), "");
     adapter->addServantLocator(new ServantLocatorI("category"), "category");
-    adapter->add(new TestI, communicator()->stringToIdentity("asm"));
-    adapter->add(new TestActivationI, communicator()->stringToIdentity("test/activation"));
+    adapter->add(new TestI, communicator->stringToIdentity("asm"));
+    adapter->add(new TestActivationI, communicator->stringToIdentity("test/activation"));
     adapter->activate();
+    TEST_READY
     adapter->waitForDeactivate();
     return EXIT_SUCCESS;
 }
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+        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;
+}
diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp
index a5fb931c8f4..85c3ea69f38 100644
--- a/cpp/test/Ice/servantLocator/ServerAMD.cpp
+++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp
@@ -12,6 +12,8 @@
 #include <TestCommon.h>
 #include <TestAMDI.h>
 
+DEFINE_TEST("serveramd")
+
 using namespace std;
 using namespace Ice;
 
@@ -68,33 +70,55 @@ public:
     }
 };
 
-class TestServer : public Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
 int
-main(int argc, char* argv[])
+run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    TestServer app;
-    return app.main(argc, argv);
-}
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
+    communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
 
-int
-TestServer::run(int, char**)
-{
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
-    communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
-
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     
     adapter->addServantLocator(new ServantLocatorAMDI(""), "");
     adapter->addServantLocator(new ServantLocatorAMDI("category"), "category");
-    adapter->add(new TestAMDI, communicator()->stringToIdentity("asm"));
-    adapter->add(new TestActivationI, communicator()->stringToIdentity("test/activation"));
+    adapter->add(new TestAMDI, communicator->stringToIdentity("asm"));
+    adapter->add(new TestActivationI, communicator->stringToIdentity("test/activation"));
     adapter->activate();
+    TEST_READY
     adapter->waitForDeactivate();
     return EXIT_SUCCESS;
 }
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+        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;
+}
diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp
index 4a3fe477a71..96b13b41185 100644
--- a/cpp/test/Ice/slicing/exceptions/Client.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Client.cpp
@@ -14,6 +14,8 @@
 using namespace std;
 using namespace Test;
 
+DEFINE_TEST("client")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp
index 3e94d33f966..bad1030a40b 100644
--- a/cpp/test/Ice/slicing/exceptions/Server.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Server.cpp
@@ -9,9 +9,12 @@
 
 #include <Ice/Ice.h>
 #include <TestI.h>
+#include <TestCommon.h>
 
 using namespace std;
 
+DEFINE_TEST("server")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -22,6 +25,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new TestI();
     adapter->add(object, communicator->stringToIdentity("Test"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
index 954fe097009..2efe5726db5 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
@@ -9,9 +9,12 @@
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
+#include <TestCommon.h>
 
 using namespace std;
 
+DEFINE_TEST("serveramd")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -22,6 +25,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new TestI();
     adapter->add(object, communicator->stringToIdentity("Test"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp
index a961eaf83e6..dc543374295 100644
--- a/cpp/test/Ice/slicing/objects/Client.cpp
+++ b/cpp/test/Ice/slicing/objects/Client.cpp
@@ -14,6 +14,8 @@
 using namespace std;
 using namespace Test;
 
+DEFINE_TEST("client")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp
index 3e94d33f966..bad1030a40b 100644
--- a/cpp/test/Ice/slicing/objects/Server.cpp
+++ b/cpp/test/Ice/slicing/objects/Server.cpp
@@ -9,9 +9,12 @@
 
 #include <Ice/Ice.h>
 #include <TestI.h>
+#include <TestCommon.h>
 
 using namespace std;
 
+DEFINE_TEST("server")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -22,6 +25,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new TestI();
     adapter->add(object, communicator->stringToIdentity("Test"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
index 954fe097009..2efe5726db5 100644
--- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
@@ -9,9 +9,12 @@
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
+#include <TestCommon.h>
 
 using namespace std;
 
+DEFINE_TEST("serveramd")
+
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
@@ -22,6 +25,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new TestI();
     adapter->add(object, communicator->stringToIdentity("Test"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }