diff test/sematest/TestInterManagerSession.java @ 336:d00cb51ba652

*** empty log message ***
author kono
date Sun, 12 Oct 2008 18:06:54 +0900
parents 5a78e73ecba5
children 4b056e46ba83
line wrap: on
line diff
--- a/test/sematest/TestInterManagerSession.java	Sun Oct 12 15:09:46 2008 +0900
+++ b/test/sematest/TestInterManagerSession.java	Sun Oct 12 18:06:54 2008 +0900
@@ -26,13 +26,17 @@
 				// executed before first select();
 				public void exec(SessionManager manager) {	
 					for(TestEditor editor:editors) {
-						if(editor.getPort()==masterPort)
+						if(editor.getPort()==manager.getPort()) {
+							logger.writeLog("Start client "+editor);
 								editor.start();
+						}
 					}
 					int i = sessionManagers.length;
 					for(SessionManager slave:slaveSessionManagers) {
-						if (slave.getParentPort()==masterPort)
+						if (slave.getParentPort()==masterPort) {
+							logger.writeLog("Start slave "+slave);
 							i = startSessionManager(slave,i,masterPort + i);
+						}
 					}
 				}
 			},
@@ -42,8 +46,10 @@
 				public void exec(SessionManager manager) {	
 					manager.connectSession(host);
 					for(TestEditor editor:editors) {
-						if(editor.getPort()==masterPort+1)
-						editor.start();
+						if(editor.getPort()==manager.getPort()) {
+							logger.writeLog("Start client "+editor);
+							editor.start();
+						}
 					}
 				}
 			},
@@ -53,8 +59,10 @@
 				public void exec(SessionManager manager) {	
 					manager.connectSession(host);
 					for(TestEditor editor:editors) {
-						if(editor.getPort()==masterPort+2)
-						editor.start();
+						if(editor.getPort()==manager.getPort()) {
+							logger.writeLog("Start client "+editor);
+							editor.start();
+						}
 					}
 				}
 			}
@@ -95,6 +103,15 @@
 		return ;
 	}
 
+	@Override
+	protected void startTest() {
+		int i = 0;
+		for(SessionManager master:sessionManagers) {
+			logger.writeLog("Start master "+master);
+			i = startSessionManager(master,i, masterPort + i);
+		}
+	}
+	
 	public static void main(String[] args){
 		/*
 		 * set simulation mode