2 files changed, 25 insertions, 2 deletions
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")