ICE-6774 added iceboxadmin test to IceBox/admin

7 files changed, 67 insertions, 13 deletions

diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 1ec6952b76f..7e3bf812513 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -43,7 +43,7 @@ void
 Client::usage()
 {
     cerr << "Usage: " << appName() << " [options] [command...]\n";
-    cerr <<        
+    cerr <<
         "Options:\n"
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.\n"
@@ -91,7 +91,7 @@ Client::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-  
+
     ObjectPrx base = communicator()->propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
 
     if(base == 0)
@@ -105,7 +105,7 @@ Client::run(int argc, char* argv[])
         Identity managerIdentity;
         managerIdentity.category = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox");
         managerIdentity.name = "ServiceManager";
-        
+
         string managerProxy;
         if(properties->getProperty("Ice.Default.Locator").empty())
         {
@@ -115,7 +115,7 @@ Client::run(int argc, char* argv[])
                 cerr << appName() << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
                 return EXIT_FAILURE;
             }
-            
+
             managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" :" + managerEndpoints;
         }
         else
@@ -126,7 +126,7 @@ Client::run(int argc, char* argv[])
                 cerr << appName() << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
                 return EXIT_FAILURE;
             }
-            
+
             managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" @" + managerAdapterId;
         }
 
@@ -176,6 +176,7 @@ Client::run(int argc, char* argv[])
             catch(const IceBox::NoSuchServiceException&)
             {
                 cerr << appName() << ": unknown service `" << *r << "'" << endl;
+                return EXIT_FAILURE;
             }
             catch(const IceBox::AlreadyStartedException&)
             {
@@ -197,6 +198,7 @@ Client::run(int argc, char* argv[])
             catch(const IceBox::NoSuchServiceException&)
             {
                 cerr << appName() << ": unknown service `" << *r << "'" << endl;
+                return EXIT_FAILURE;
             }
             catch(const IceBox::AlreadyStoppedException&)
             {
diff --git a/cpp/test/IceBox/admin/config.admin b/cpp/test/IceBox/admin/config.admin
new file mode 100644
index 00000000000..e0612fe4f07
--- /dev/null
+++ b/cpp/test/IceBox/admin/config.admin
@@ -0,0 +1,4 @@
+#
+# Proxy to the IceBox ServiceManager:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h localhost
diff --git a/cpp/test/IceBox/admin/run.py b/cpp/test/IceBox/admin/run.py
index 7f24cb1f9a1..3407a00c52c 100755
--- a/cpp/test/IceBox/admin/run.py
+++ b/cpp/test/IceBox/admin/run.py
@@ -25,3 +25,20 @@ icebox = TestUtil.getIceBox()
 config = os.path.join(os.getcwd(), "config.icebox")
 
 TestUtil.clientServerTest(additionalServerOptions= '--Ice.Config=\"%s\"' % config, server = icebox)
+
+sys.stdout.write("testing iceboxadmin... ")
+sys.stdout.flush()
+
+admin = TestUtil.getIceBoxAdmin()
+adminconfig = os.path.join(os.getcwd(), "config.admin")
+
+ib = TestUtil.startServer(icebox, args = '--Ice.Config=\"%s\"' % config)
+iba = TestUtil.startClient(admin, args = '--Ice.Config=\"%s\" stop TestService' % adminconfig)
+iba.waitTestSuccess()
+iba = TestUtil.startClient(admin, args = '--Ice.Config=\"%s\" start TestService' % adminconfig)
+iba.waitTestSuccess()
+iba = TestUtil.startClient(admin, args = '--Ice.Config=\"%s\" shutdown' % adminconfig)
+iba.waitTestSuccess()
+ib.waitTestSuccess()
+
+print("ok")
diff --git a/java/src/IceBox/src/main/java/IceBox/Admin.java b/java/src/IceBox/src/main/java/IceBox/Admin.java
index 2b257d6990e..812008de64a 100644
--- a/java/src/IceBox/src/main/java/IceBox/Admin.java
+++ b/java/src/IceBox/src/main/java/IceBox/Admin.java
@@ -131,6 +131,7 @@ public final class Admin
                     catch(IceBox.NoSuchServiceException ex)
                     {
                         System.err.println(appName() + ": unknown service `" + service + "'");
+                        return 1;
                     }
                     catch(IceBox.AlreadyStartedException ex)
                     {
@@ -153,6 +154,7 @@ public final class Admin
                     catch(IceBox.NoSuchServiceException ex)
                     {
                         System.err.println(appName() + ": unknown service `" + service + "'");
+                        return 1;
                     }
                     catch(IceBox.AlreadyStoppedException ex)
                     {
diff --git a/java/test/src/main/java/test/IceBox/admin/config.admin b/java/test/src/main/java/test/IceBox/admin/config.admin
new file mode 100644
index 00000000000..e0612fe4f07
--- /dev/null
+++ b/java/test/src/main/java/test/IceBox/admin/config.admin
@@ -0,0 +1,4 @@
+#
+# Proxy to the IceBox ServiceManager:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h localhost
diff --git a/java/test/src/main/java/test/IceBox/admin/run.py b/java/test/src/main/java/test/IceBox/admin/run.py
index 5caf573e607..8c5d5ccfdd6 100755
--- a/java/test/src/main/java/test/IceBox/admin/run.py
+++ b/java/test/src/main/java/test/IceBox/admin/run.py
@@ -21,5 +21,24 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0], "scripts"))
 import TestUtil
 
-TestUtil.clientServerTest(additionalServerOptions='--Ice.Config="%s"' % os.path.join(os.getcwd(), "config.icebox"),
-	server=TestUtil.getIceBox())
+icebox = TestUtil.getIceBox()
+config = os.path.join(os.getcwd(), "config.icebox")
+
+TestUtil.clientServerTest(additionalServerOptions='--Ice.Config="%s"' % config, server=icebox)
+
+sys.stdout.write("testing iceboxadmin... ")
+sys.stdout.flush()
+
+admin = TestUtil.getIceBoxAdmin()
+adminconfig = os.path.join(os.getcwd(), "config.admin")
+
+ib = TestUtil.startServer(icebox, args = '--Ice.Config=\"%s\"' % config)
+iba = TestUtil.startClient(admin, args = '--Ice.Config=\"%s\" stop TestService' % adminconfig)
+iba.waitTestSuccess()
+iba = TestUtil.startClient(admin, args = '--Ice.Config=\"%s\" start TestService' % adminconfig)
+iba.waitTestSuccess()
+iba = TestUtil.startClient(admin, args = '--Ice.Config=\"%s\" shutdown' % adminconfig)
+iba.waitTestSuccess()
+ib.waitTestSuccess()
+
+print("ok")
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 36bfd5c7d1e..6b22fbc1faf 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -777,7 +777,6 @@ def phpSetup(clientConfig = False, iceOptions = None, iceProfile = None):
     tmpini.close()
 
 def getIceBox():
-    global compact
     global cpp11
 
     #
@@ -799,15 +798,22 @@ def getIceBox():
     elif lang == "java":
         iceBox = "IceBox.Server"
     elif lang == "csharp":
-        if compact:
-            iceBox = os.path.join(getIceDir("csharp"), "bin", "cf", "iceboxnet")
-        else:
-            iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet")
+        iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet")
 
     return iceBox
 
 def getIceBoxAdmin():
-    return getIceExe("iceboxadmin")
+    #
+    # Get and return the path of the IceBoxAdmin executable
+    #
+    lang = getDefaultMapping()
+    if lang == "java":
+        iceBoxAdmin = "IceBox.Admin"
+    else:
+        return getIceExe("iceboxadmin")
+        iceBoxAdmin = "iceboxadmin"
+
+    return iceBoxAdmin
 
 def getIceGridAdmin():
     return getIceExe("icegridadmin")