changeset 180:f34608ae1ed2

*** empty log message ***
author kent
date Fri, 29 Aug 2008 12:37:02 +0900
parents 763aad2da6b3
children 3a2c6c2f9761
files test/channeltest/testEditor.java test/channeltest/testNetworkSimulator.java test/channeltest/testSeMa.java test/channeltest/testSeMaSlave.java
diffstat 4 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/channeltest/testEditor.java	Thu Aug 28 22:53:05 2008 +0900
+++ b/test/channeltest/testEditor.java	Fri Aug 29 12:37:02 2008 +0900
@@ -30,7 +30,7 @@
 			}
 			ns.writeLog("successes to connect", 1);
 
-			channel.write("from "+getName()+": hello");
+			channel.write(getName()+": send hello");
 			ns.writeLog("wrote packet", 1);
 
 			String packet = channel.read();
--- a/test/channeltest/testNetworkSimulator.java	Thu Aug 28 22:53:05 2008 +0900
+++ b/test/channeltest/testNetworkSimulator.java	Fri Aug 29 12:37:02 2008 +0900
@@ -16,7 +16,7 @@
 
 	public static void main(String[] args){
 		REPServerSocketChannel.isSimulation = true;
-		testNetworkSimulator testns = new testNetworkSimulator(1, 0, 50);
+		testNetworkSimulator testns = new testNetworkSimulator(1, 2, 5);
 		logger.setLogLevel(5);
 		
 		testns.startTest();
--- a/test/channeltest/testSeMa.java	Thu Aug 28 22:53:05 2008 +0900
+++ b/test/channeltest/testSeMa.java	Fri Aug 29 12:37:02 2008 +0900
@@ -74,7 +74,7 @@
 						String packet;
 						packet = channel.read();
 						ns.writeLog("receives String==> `"+packet+"\'", 1);
-						channel.write("from SeMa"+this.getName()+": world");
+						channel.write(this.getName()+": get `"+packet+"\'");
 					}
 				}
 			}
--- a/test/channeltest/testSeMaSlave.java	Thu Aug 28 22:53:05 2008 +0900
+++ b/test/channeltest/testSeMaSlave.java	Fri Aug 29 12:37:02 2008 +0900
@@ -34,13 +34,13 @@
 	public void run() {
 		REPSelector selector;
 		REPSocketChannel<String> masterCH ;
-		REPServerSocketChannel<String> scs = new REPServerSocketChannel<String>();
 		try {
+			REPServerSocketChannel<String> scs = REPServerSocketChannel.<String>open();
 			selector = REPSelector.create();
 			masterCH = connectToMaster(selector);
 			scs.socket().bind(ownIP);
-			selector.register(scs, SelectionKey.OP_ACCEPT,null);
-			selector.register(masterCH, SelectionKey.OP_READ,null);
+			scs.register(selector, SelectionKey.OP_ACCEPT,null);
+			masterCH.register(selector, SelectionKey.OP_READ,null);
 
 
 			ns.writeLog("SessionManager starts mainroutin.", 1);
@@ -66,13 +66,13 @@
 						if (channel==masterCH){
 							ns.writeLog("receives String from master ==> `"+packet+"\'", 1);
 							for (ClientInfo ci: cis){
-								if (!packet.matches(ci.str)) continue;
-								ci.channel.write("from "+this.getName()+": loopback packet from master ==>`"+packet+"\'");
+								if (!packet.matches(".*"+ci.str+".*")) continue;
+								ci.channel.write(this.getName()+": loopback master ==>`"+packet+"\'");
 							}
 						}else{
 							ns.writeLog("receives String==> `"+packet+"\'", 1);
-							//channel.write("from "+this.getName()+": slave");
-							masterCH.write("from "+this.getName()+": receive String==>`"+packet+"\' from editor");
+							//channlel.write("from "+this.getName()+": save");
+							masterCH.write(this.getName()+": pass packet`"+packet+"\'");
 							cis.add(new ClientInfo(packet, channel));
 						}
 					}