[jboss-cvs] JBoss Messaging SVN: r5970 - in trunk: tests/config and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-03-03 11:02:17 -0500 (Tue, 03 Mar 2009)
New Revision: 5970

Modified:
   trunk/build-messaging.xml
   trunk/tests/config/restricted-security-client.policy
   trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java
Log:
fixed NettySecurityClientTest

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-03-03 14:21:06 UTC (rev 5969)
+++ trunk/build-messaging.xml	2009-03-03 16:02:17 UTC (rev 5970)
@@ -289,6 +289,13 @@
    </path>
 
    <path id="unit.test.execution.classpath">
+      <!-- ensure that the core client jar is included for
+           tests security tests which needs to read version.properties
+           from inside this jar
+      -->
+      <fileset dir="${build.jars.dir}">
+         <include name="${core.client.jar.name}"/>
+      </fileset>
       <pathelement location="${test.dir}/config"/>
       <pathelement location="${test.dir}/tmpfiles"/>
       <pathelement location="${test.classes.dir}"/>
@@ -1166,6 +1173,7 @@
             <formatter type="plain" usefile="${junit.formatter.usefile}"/>
             <fileset dir="${test.classes.dir}">
                <include name="${tests.param}"/>
+               <exclude name="**/LargeMessageMultiThreadFailoverTest.class" />
             </fileset>
          </batchtest>
       </junit>

Modified: trunk/tests/config/restricted-security-client.policy
===================================================================
--- trunk/tests/config/restricted-security-client.policy	2009-03-03 14:21:06 UTC (rev 5969)
+++ trunk/tests/config/restricted-security-client.policy	2009-03-03 16:02:17 UTC (rev 5970)
@@ -3,4 +3,6 @@
         
         // allow to connect to localhost
         permission java.net.SocketPermission "*:1024-", "connect";
+        // normally, we don't need this permission since the applet allows to read jars loaded by the applet
+        permission java.io.FilePermission "${user.dir}/build/jars/jbm-core-client.jar", "read";
 };
\ No newline at end of file

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java	2009-03-03 14:21:06 UTC (rev 5969)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java	2009-03-03 16:02:17 UTC (rev 5970)
@@ -118,8 +118,12 @@
       while ((line = br.readLine()) != null)
       {
          line = line.replace('|', '\n');
-         if ("OK".equals(line.trim()))
+         if (line.startsWith("Listening"))
          {
+            continue;
+         }
+         else if ("OK".equals(line.trim()))
+         {
             break;
          } else
          {