From dev-return-121698-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org Sun Nov 6 21:17:19 2011 Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C33029E5C for ; Sun, 6 Nov 2011 21:17:19 +0000 (UTC) Received: (qmail 30508 invoked by uid 500); 6 Nov 2011 21:17:18 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 30441 invoked by uid 500); 6 Nov 2011 21:17:18 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 30432 invoked by uid 99); 6 Nov 2011 21:17:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Nov 2011 21:17:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Nov 2011 21:17:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 37A97238889B for ; Sun, 6 Nov 2011 21:16:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1198561 - in /tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test: ./ channel/ transport/ Date: Sun, 06 Nov 2011 21:16:52 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111106211653.37A97238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kkolinko Date: Sun Nov 6 21:16:52 2011 New Revision: 1198561 URL: http://svn.apache.org/viewvc?rev=1198561&view=rev Log: Porting r1187806 - whitespace cleanup in /test Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java?rev=1198561&r1=1198560&r2=1198561&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java Sun Nov 6 21:16:52 2011 @@ -45,17 +45,17 @@ public class NioSenderTest { public NioSenderTest() { // Default constructor } - + public synchronized int inc() { return ++counter; } - + public synchronized ChannelData getMessage(Member mbr) { String msg = "Thread-"+Thread.currentThread().getName()+" Message:"+inc(); ChannelData data = new ChannelData(true); data.setMessage(new XByteBuffer(msg.getBytes(),false)); data.setAddress(mbr); - + return data; } @@ -107,7 +107,7 @@ public class NioSenderTest { sender.reset(); sender.setMessage(XByteBuffer.createDataPackage(getMessage(mbr))); } - + } catch (Throwable t) { t.printStackTrace(); Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=1198561&r1=1198560&r2=1198561&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java Sun Nov 6 21:16:52 2011 @@ -83,7 +83,7 @@ public class TestMulticastPackages { AbstractSender s2 =(AbstractSender) ((ReplicationTransmitter)channel2.getChannelSender()).getTransport(); s1.setTimeout(Long.MAX_VALUE); //for debugging s2.setTimeout(Long.MAX_VALUE); //for debugging - + System.err.println("Starting Single package NO_ACK"); channel1.send(new Member[] {channel2.getLocalMember(false)}, Data.createRandomData(1024),Channel.SEND_OPTIONS_MULTICAST); Thread.sleep(500); @@ -91,7 +91,7 @@ public class TestMulticastPackages { assertEquals("Checking success messages.",1,listener1.count.get()); } - + public static void printMissingMsgs(int[] msgs, int maxIdx) { for (int i=0; iTitle:

- * - *

Description:

- * + *

Title:

+ * + *

Description:

+ * *

Company:

- * + * * @author not attributable * @version 1.0 */ Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=1198561&r1=1198560&r2=1198561&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java Sun Nov 6 21:16:52 2011 @@ -83,7 +83,7 @@ public class TestUdpPackages { AbstractSender s2 =(AbstractSender) ((ReplicationTransmitter)channel2.getChannelSender()).getTransport(); s1.setTimeout(Long.MAX_VALUE); //for debugging s2.setTimeout(Long.MAX_VALUE); //for debugging - + System.err.println("Starting Single package NO_ACK"); channel1.send(new Member[] {channel2.getLocalMember(false)}, Data.createRandomData(1024),Channel.SEND_OPTIONS_UDP); Thread.sleep(500); @@ -120,7 +120,7 @@ public class TestUdpPackages { } } }; - } + } for (int x=0; x 0 ) try {size=Integer.parseInt(args[0]);}catch(Exception x){ /* Ignore */ } @@ -78,7 +78,7 @@ public class SocketTribesReceive { printStats(start, mb, count, df, total); } } - + } private static void printStats(long start, double mb, int count, DecimalFormat df, BigDecimal total) { Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java?rev=1198561&r1=1198560&r2=1198561&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java Sun Nov 6 21:16:52 2011 @@ -32,11 +32,11 @@ public class SocketValidateReceive { static BigDecimal total = new BigDecimal(0); static BigDecimal bytes = new BigDecimal(32871); - + public static void main(String[] args) throws Exception { int size = 43800; if (args.length > 0 ) try {size=Integer.parseInt(args[0]);}catch(Exception x){ /* Ignore */ } - + ServerSocket srvSocket = new ServerSocket(9999); System.out.println("Listening on 9999"); Socket socket = srvSocket.accept(); @@ -65,7 +65,7 @@ public class SocketValidateReceive { System.exit(1); } count += reader.append(buf,0,len); - + if ( bytes.intValue() != len ) bytes = new BigDecimal((double)len); total = total.add(bytes); mb += ( (double) len) / 1024 / 1024; @@ -73,7 +73,7 @@ public class SocketValidateReceive { printStats(start, mb, count, df, total); } } - + } private static void printStats(long start, double mb, int count, DecimalFormat df, BigDecimal total) { @@ -81,7 +81,7 @@ public class SocketValidateReceive { double seconds = ((double)(time-start))/1000; System.out.println("Throughput "+df.format(mb/seconds)+" MB/seconds messages "+count+", total "+mb+" MB, total "+total+" bytes."); } - + public static class MyDataReader { int length = 10; int cur = 0; @@ -89,10 +89,10 @@ public class SocketValidateReceive { public MyDataReader(int len) { length = len; } - + public int append(byte[] b, int off, int len) throws Exception { int packages = 0; - for ( int i=off; i