Mercurial > hg > RemoteEditor > REPSessionManager
changeset 335:5a78e73ecba5
*** empty log message ***
author | kono |
---|---|
date | Sun, 12 Oct 2008 15:09:46 +0900 |
parents | 4fae49280699 |
children | d00cb51ba652 |
files | test/sematest/TestInterManagerSession.java test/sematest/TestSessionManager.java |
diffstat | 2 files changed, 28 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sematest/TestInterManagerSession.java Sun Oct 12 14:38:58 2008 +0900 +++ b/test/sematest/TestInterManagerSession.java Sun Oct 12 15:09:46 2008 +0900 @@ -17,10 +17,10 @@ * master session managers using syncExec. */ - int slavePort[] = {masterPort,masterPort,masterPort}; - int editorPort[] = {masterPort,masterPort+1,masterPort+2}; - boolean editorMaster[] = {true,false,false,false}; - SessionManagerEvent ev1[] = { + public int slavePort[] = {masterPort,masterPort,masterPort}; + public int editorPort[] = {masterPort,masterPort+1,masterPort+2}; + public boolean editorMaster[] = {true,false,false,false}; + private SessionManagerEvent ev2[] = { new SessionManagerEvent() { // event for master // executed before first select(); @@ -87,6 +87,13 @@ } } + @Override + public void setSMEvent(SessionManager s,int i) { + if (i<ev2.length) { + s.syncExec(ev2[i]); + } + return ; + } public static void main(String[] args){ /* @@ -96,7 +103,7 @@ */ REPServerSocketChannel.isSimulation = true; // At least 3 TestEditors are required. - TestInterManagerSession test = new TestInterManagerSession(1, 0, 3); + TestInterManagerSession test = new TestInterManagerSession(1, 2, 3); logger.setLogLevel(5); test.startTest(); }
--- a/test/sematest/TestSessionManager.java Sun Oct 12 14:38:58 2008 +0900 +++ b/test/sematest/TestSessionManager.java Sun Oct 12 15:09:46 2008 +0900 @@ -11,11 +11,11 @@ public class TestSessionManager { static public REPLogger logger = REPLogger.singleton(); - int masterPort = 8766; - String host = "localhost"; - SessionManager sessionManagers[]; - SessionManager slaveSessionManagers[]; - TestEditor editors[]; + public int masterPort = 8766; + public String host = "localhost"; + public SessionManager sessionManagers[]; + public SessionManager slaveSessionManagers[]; + public TestEditor editors[]; /* * All test is performed in localhost, so all session manager @@ -29,9 +29,9 @@ * Editor or slave session manager must be started by * master session managers using syncExec. */ - int editorPort[] = {masterPort,masterPort,masterPort}; - boolean editorMaster[] = {true,false,false,false}; - SessionManagerEvent ev1[] = { + public int editorPort[] = {masterPort,masterPort,masterPort}; + public boolean editorMaster[] = {true,false,false,false}; + private SessionManagerEvent ev1[] = { new SessionManagerEvent() { // executed before first select(); public void exec(SessionManager manager) { @@ -77,8 +77,7 @@ final int port1 = port; logger.writeLog("TestSessionManager.startSessionManager() : start SessionManager"); // syncExec does not wake selector, do this before run(). - if (i<ev1.length) - sm.syncExec(ev1[i]); + setSMEvent(sm,i); Runnable start = new Runnable() { public void run() { try { @@ -93,6 +92,13 @@ } + public void setSMEvent(SessionManager s,int i) { + if (i<ev1.length) { + s.syncExec(ev1[i]); + } + return ; + } + protected void startTest() { int i = 0; for(SessionManager master:sessionManagers) {