svn commit: r165103 - in /directory/network/trunk: maven.xml src/test/org/apache/mina/examples/echoserver/AcceptorTest.java

[tr...@apache.org]

Author: trustin
Date: Wed Apr 27 23:00:30 2005
New Revision: 165103

URL: http://svn.apache.org/viewcvs?rev=165103&view=rev
Log:
* Fixed: AcceptorTest fails while coverage testing
* Fixed: maven.emma.inreport property doesn't change


Modified:
    directory/network/trunk/maven.xml
    directory/network/trunk/src/test/org/apache/mina/examples/echoserver/AcceptorTest.java

Modified: directory/network/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/directory/network/trunk/maven.xml?rev=165103&r1=165102&r2=165103&view=diff
==============================================================================
--- directory/network/trunk/maven.xml (original)
+++ directory/network/trunk/maven.xml Wed Apr 27 23:00:30 2005
@@ -116,22 +116,26 @@
   </goal>
 
   <preGoal name="emma:replace-product-classes">
+    <j:set var="maven.emma.inreport" value="${context.getVariable('maven.emma.inreport')}"/>
     <j:if test="${context.getVariable('maven.emma.inreport') != 'true'}">
       <attainGoal name="emma:backup-main"/>
     </j:if>
   </preGoal>
   <postGoal name="emma:replace-product-classes">
+    <j:set var="maven.emma.inreport" value="${context.getVariable('maven.emma.inreport')}"/>
     <j:if test="${context.getVariable('maven.emma.inreport') != 'true'}">
       <attainGoal name="emma:restore-main"/>
     </j:if>
   </postGoal>
 
   <preGoal name="emma:replace-testing-classes">
+    <j:set var="maven.emma.inreport" value="${context.getVariable('maven.emma.inreport')}"/>
     <j:if test="${context.getVariable('maven.emma.inreport') != 'true'}">
       <attainGoal name="emma:backup-test"/>
     </j:if>
   </preGoal>
   <postGoal name="emma:replace-testing-classes">
+    <j:set var="maven.emma.inreport" value="${context.getVariable('maven.emma.inreport')}"/>
     <j:if test="${context.getVariable('maven.emma.inreport') != 'true'}">
       <attainGoal name="emma:restore-test"/>
     </j:if>
@@ -142,11 +146,11 @@
     <attainGoal name="emma:backup-main"/>
     <attainGoal name="emma:backup-test"/>
     <echo>Turning on EMMA for report generation.</echo>
-    <ant:property name="maven.emma.inreport" value="true"/>
+    <j:set var="maven.emma.inreport" value="true"/>
     <attainGoal name="emma:test-with-forced-fork"/>
   </preGoal>
   <postGoal name="emma:realreport">
-    <ant:property name="maven.emma.inreport" value="false"/>
+    <j:set var="maven.emma.inreport" value="false"/>
     <echo>Turning off EMMA.</echo>
     <attainGoal name="emma:restore-main"/>
     <attainGoal name="emma:restore-test"/>

Modified: directory/network/trunk/src/test/org/apache/mina/examples/echoserver/AcceptorTest.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/examples/echoserver/AcceptorTest.java?rev=165103&r1=165102&r2=165103&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/examples/echoserver/AcceptorTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/examples/echoserver/AcceptorTest.java Wed Apr 27 23:00:30 2005
@@ -116,8 +116,6 @@
     private void testTCP0( EchoTCPClient client ) throws Exception
     {
         client.connect( InetAddress.getLocalHost(), port );
-        client.setSoTimeout( 3000 );
-
         byte[] writeBuf = new byte[ 16 ];
 
         for( int i = 0; i < 10; i ++ )
@@ -125,6 +123,8 @@
             fillWriteBuffer( writeBuf, i );
             client.getOutputStream().write( writeBuf );
         }
+
+        client.setSoTimeout( 30000 );
 
         byte[] readBuf = new byte[ writeBuf.length ];