diff options
| author | Jose <jose@zeroc.com> | 2015-01-23 09:56:00 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-23 09:56:00 +0100 |
| commit | 709ff7a6514bfdff201e0a8ad3d64928de63a8cc (patch) | |
| tree | d93685065705bf5c74da363fd26c14cd2fbc5319 /java/test/controller/src | |
| parent | Port test controller server to Java (diff) | |
| download | ice-709ff7a6514bfdff201e0a8ad3d64928de63a8cc.tar.bz2 ice-709ff7a6514bfdff201e0a8ad3d64928de63a8cc.tar.xz ice-709ff7a6514bfdff201e0a8ad3d64928de63a8cc.zip | |
Java test controller server fixes
Diffstat (limited to 'java/test/controller/src')
| -rw-r--r-- | java/test/controller/src/main/java/test/Common/ControllerServer.java (renamed from java/test/controller/src/main/java/test/common/ControllerServer.java) | 16 | ||||
| -rw-r--r-- | java/test/controller/src/main/slice/Controller.ice | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/java/test/controller/src/main/java/test/common/ControllerServer.java b/java/test/controller/src/main/java/test/Common/ControllerServer.java index 11ca470af65..9fb8ac22e29 100644 --- a/java/test/controller/src/main/java/test/common/ControllerServer.java +++ b/java/test/controller/src/main/java/test/Common/ControllerServer.java @@ -7,11 +7,11 @@ // // ********************************************************************** -package test.common; +package test.Common; -import test.common._ControllerDisp; -import test.common._ServerDisp; -import test.common.ServerPrx; +import test.Common._ControllerDisp; +import test.Common._ServerDisp; +import test.Common.ServerPrx; import java.io.File; import java.io.BufferedReader; @@ -45,9 +45,9 @@ public class ControllerServer extends Ice.Application String line = null; while((line = reader.readLine()) != null) { - if(line.matches(Pattern.quote("starting server... ok")) || - line.matches(Pattern.quote("starting serveramd... ok")) || - line.matches("starting test.*" + Pattern.quote("Server... ok"))) + if(line.matches(Pattern.quote("starting server...") + ".*ok") || + line.matches(Pattern.quote("starting serveramd...") + ".*ok") || + line.matches("starting test.*" + Pattern.quote("Server...") + ".*ok")) { synchronized(ServerI.this) { @@ -155,7 +155,7 @@ public class ControllerServer extends Ice.Application } String script = name.equals("Ice/echo") ? - (lang.equals("java") ? "java/test/src/main/java/" : "cpp/") + "test/Ice/echo/run.py" : + lang + (lang.equals("java") ? "/test/src/main/java/" : "/") + "test/Ice/echo/run.py" : "allTests.py"; java.util.List<String> args = new java.util.ArrayList<String>(); diff --git a/java/test/controller/src/main/slice/Controller.ice b/java/test/controller/src/main/slice/Controller.ice index 5f89858a42d..536e42895d9 100644 --- a/java/test/controller/src/main/slice/Controller.ice +++ b/java/test/controller/src/main/slice/Controller.ice @@ -10,7 +10,7 @@ module test { -module common +module Common { interface Server |