[jboss-cvs] JBossAS SVN: r79401 - in branches/JBPAPP_4_2_0_GA_CP: testsuite and 1 other directories.

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

Author: pskopek at redhat.com
Date: 2008-10-13 11:02:00 -0400 (Mon, 13 Oct 2008)
New Revision: 79401

Modified:
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cc/testCaseMapping_1.0.xml
Log:
CC JNDI tests failures fixed + mapping sort out

Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy	2008-10-13 14:56:34 UTC (rev 79400)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy	2008-10-13 15:02:00 UTC (rev 79401)
@@ -561,18 +561,13 @@
 //
 //**************************************************************
 
-//grant codeBase "file:${jboss.test.deploy.dir}/securitymgr-ejb.jar" {
-//   permission java.util.PropertyPermission "*", "read";
-//   permission java.lang.RuntimePermission "queuePrintJob";
-//   permission java.net.SocketPermission "*", "connect";
-//};
-
 // Permissions for the WarPermissionsUnitTestCase
 //Permissions for crypto tests (putProvider)
 grant codeBase "file:${jboss.test.deploy.dir}/-" {
    permission java.util.PropertyPermission "*", "read";
    permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
    permission java.security.SecurityPermission "putProviderProperty.JBossSX";
+   permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>", "bind,rebind,unbind,lookup,list,listBindings,createSubcontext"; 
 };
 
 // Following JDBC driver is included just for CC test purpose 

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-10-13 14:56:34 UTC (rev 79400)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-10-13 15:02:00 UTC (rev 79401)
@@ -626,6 +626,8 @@
   <!-- pattern sets for CC testing -->
   <patternset id="cc.eap.includes" includesfile="output/eap-cc-test-patterns.txt" >
   </patternset>  
+  <patternset id="cc.eap.sm.includes" includesfile="output/eap-cc-test-patterns.txt" >
+  </patternset>  
   <patternset id="cc.ejb3.includes" includesfile="output/ejb3-cc-test-patterns.txt">
   </patternset>  
   <patternset id="cc.jbm.includes" includesfile="output/jbm-cc-test-patterns.txt">
@@ -950,7 +952,7 @@
 
     <server:start name="cc-sm"/>
     
-    <!-- <antcall target="run-cc-tests-sm"/> --> 
+    <antcall target="run-cc-tests-sm"/>  
   	<antcall target="run-cc-tests"/>
 
   	<antcall target="tests-report"/>
@@ -1056,7 +1058,12 @@
 
     <patternset id="test.includes">
       <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class"/>
-      <patternset refid="securitymgr.includes"/>
+      <exclude name="org/jboss/test/securitymgr/test/WarPermissionsUnitTestCase.class"/>
+      <exclude name="org/jboss/test/web/test/**/*.class"/>
+      <exclude name="org/jboss/test/security/test/**/*.class"/>
+      <exclude name="org/jboss/test/jmx/test/**/*.class"/>
+      <exclude name="org/jboss/test/naming/test/**/*.class"/>
+      <patternset refid="cc.eap.sm.includes"/>
     </patternset>
     <run-junit junit.patternset="test.includes" junit.syspropertyset="tests-security-manager-props" junit.configuration="tests-security-manager"/>
 

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cc/testCaseMapping_1.0.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cc/testCaseMapping_1.0.xml	2008-10-13 14:56:34 UTC (rev 79400)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cc/testCaseMapping_1.0.xml	2008-10-13 15:02:00 UTC (rev 79401)
@@ -1033,6 +1033,7 @@
         <TSFI>tsfi.rmi.jrmp</TSFI>
       </test>
     </testCase>    
+    <!--  
     <testCase name="org.jboss.test.securitymgr.test.EJBSpecUnitTestCase">
       <desc>Tests of the programming restrictions defined by the EJB spec. The JBoss
 server must be running under a security manager. The securitymgr-ejb.jar
@@ -1099,7 +1100,8 @@
         <desc></desc>
         <TSFI>tsfi.rmi.jrmp</TSFI>
       </test>
-    </testCase>    
+    </testCase>
+    -->    
     <testCase name="org.jboss.test.securitymgr.test.PolicyUnitTestCase">
       <desc>Tests of the security permission enforcement that creates and directly
  invokes the ejb methods to test the security policy permissions
@@ -1133,6 +1135,7 @@
         <TSFI>tsfi.rmi.jrmp</TSFI>
       </test>
     </testCase>    
+    <!-- 
     <testCase name="org.jboss.test.securitymgr.test.SecurityUnitTestCase">
       <desc>Tests of the security permission enforcement for items outside of the
  standard EJB programming restrictions.</desc>
@@ -1173,6 +1176,7 @@
         <TSFI>tsfi.rmi.jrmp</TSFI>
       </test>
     </testCase>    
+    -->
     <testCase name="org.jboss.test.web.test.WebIntegrationUnitTestCase">
       <desc>Tests of servlet container integration into the JBoss server. This test
  requires than a web container be integrated into the JBoss server. The tests
@@ -1633,15 +1637,6 @@
       </test>
     </testCase>    
 
-    <!-- template -->
-    <testCase name="">
-      <desc></desc>
-      <test name="">
-        <desc></desc>
-        <TSFI>tsfi.http</TSFI>
-      </test>
-    </testCase>    
-    
   </testSuite>
 
   <testSuite name="JBM">