Mercurial > hg > RemoteEditor > REPSessionManager
changeset 424:1e58479b4170
TestEditor selectionKeys fix.
| author | one |
|---|---|
| date | Thu, 31 Dec 2009 23:00:55 +0900 |
| parents | 0b6b838befeb |
| children | 91c56f90dba8 |
| files | test/sematest/TestEditor.java test/sematest/TestInterManagerSession.java test/sematest/TestSessionManager.java |
| diffstat | 3 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sematest/TestEditor.java Thu Dec 31 20:58:49 2009 +0900 +++ b/test/sematest/TestEditor.java Thu Dec 31 23:00:55 2009 +0900 @@ -126,10 +126,7 @@ while(running) { if (inputLock) { // No user input during merge mode (optional) - if (selector.select(0)>0) { - handle(channel.read()); - } - continue; + selector.select(0); } else if (selector.select(timeout)<=0) { if (syncCounter>0) { syncText(); // send the master editor buffer to clients.
--- a/test/sematest/TestInterManagerSession.java Thu Dec 31 20:58:49 2009 +0900 +++ b/test/sematest/TestInterManagerSession.java Thu Dec 31 23:00:55 2009 +0900 @@ -120,7 +120,7 @@ //cmds.add(new REPCommand(REP.SMCMD_JOIN,0,0,0,0,"Editor0-file")); cmds.add(new REPCommand(REP.SMCMD_PUT,0,0,0,0,"Editor0-file")); cmds.add(new REPCommand(REP.REPCMD_INSERT_USER,0,0,0,0,"m0")); - cmds.add(new REPCommand(REP.REPCMD_DELETE_USER,0,0,0,0,"m0")); + // cmds.add(new REPCommand(REP.REPCMD_DELETE_USER,0,0,0,0,"m0")); cmds.add(new REPCommand(REP.SMCMD_QUIT,0,0,0,0,"")); editorStartCmds = cmds; LinkedList<REPCommand>nullcmds = new LinkedList<REPCommand>();
--- a/test/sematest/TestSessionManager.java Thu Dec 31 20:58:49 2009 +0900 +++ b/test/sematest/TestSessionManager.java Thu Dec 31 23:00:55 2009 +0900 @@ -114,7 +114,7 @@ * isSimulation=true thread base simulation for PathFinder * isSimulation=false socket based communication mode */ - REPServerSocketChannel.isSimulation = true; + REPServerSocketChannel.isSimulation = false; // At least 3 TestEditors are required. TestSessionManager test = new TestSessionManager(1, 0, 3); logger.setLogLevel(5);