[jboss-cvs] JBossAS SVN: r108627 - in branches/JBPAPP_5_1/testsuite: src/resources/cc and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 17 12:01:07 EDT 2010
Author: pskopek at redhat.com
Date: 2010-10-17 12:01:06 -0400 (Sun, 17 Oct 2010)
New Revision: 108627
Added:
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/props/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/props/messaging-users.properties
Modified:
branches/JBPAPP_5_1/testsuite/build.xml
branches/JBPAPP_5_1/testsuite/src/resources/cc/ccTsfiMap.xsd
branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml
branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt
Log:
CC: final mapping
Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml 2010-10-17 09:42:09 UTC (rev 108626)
+++ branches/JBPAPP_5_1/testsuite/build.xml 2010-10-17 16:01:06 UTC (rev 108627)
@@ -1922,9 +1922,12 @@
<!-- <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class" /> -->
<!-- include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/ -->
<!-- include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/ -->
-
+
+
+ <include name="org/jboss/test/jbossmessaging/test/Jms11UnitTest.class"/>
+ <include name="org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.class"/>
<include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/>
- <!-- include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
<include name="**/test/tm/test/TxTimeout*TestCase.class"/>
<include name="org/jboss/test/security/test/CallerInfoUnitTestCase.class"/>
<include name="org.jboss.test.deployers.web.test.WEBDeploymentUnitTestCase.class"/>
@@ -1972,19 +1975,18 @@
<include name="org/jboss/test/ejb3/jbpapp2473/unit/RunAsUnitTestCase.class"/>
- <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/ -->
+ <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/>
</fileset>
</batchtest>
</junit>
- <!-- antcall target="cc-tests-ws"/ -->
+ <antcall target="cc-tests-ws"/>
<echo>Waiting for server to shutdown...</echo>
<server:stop name="cc"/>
- <!-- antcall target="cc-tests-secured"/ -->
-
+ <antcall target="cc-tests-secured"/>
<antcall target="cc-tests-cluster"/>
<!-- TS crach-recovery with JMS -->
@@ -1993,7 +1995,7 @@
<include name="org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.class"/ -->
<!-- antcall target="tests-ts-crash-recovery-jms"/ -->
- <!-- antcall target="tests-cc-audit"/ -->
+ <antcall target="tests-cc-audit"/>
<antcall target="calculate-md5"/>
<antcall target="tests-report"/>
@@ -2063,6 +2065,7 @@
<batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
<fileset dir="${build.classes}">
<include name="org/jboss/test/security/test/authorization/secured/*TestCase.class"/>
+ <exclude name="org/jboss/test/security/test/authorization/secured/HttpRequestWebConsoleAuthenticationUnitTestCase.class"/>
</fileset>
</batchtest>
</junit>
@@ -2080,7 +2083,7 @@
<delete dir="${jboss.dist}${/}server${/}cluster-*" quiet="true"/>
<patternset id="cc-cluster-tests.includes">
- <!-- include name="org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.class"/ -->
+ <include name="org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.class"/>
<include name="org/jboss/test/ann/clustered/test/Ejb3ClusteredAnnTestCase.class"/>
</patternset>
@@ -2163,6 +2166,9 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.class"/>
+ <include name="org/jboss/test/webservice/endpoint/EndpointTestCase.class"/>
+ <include name="org/jboss/test/webservice/admindevel/ExampleTestCase.class"/>
+ <include name="org/jboss/test/webservice/jbws309/JBWS309TestCase.class"/>
</fileset>
</batchtest>
</junit>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/ccTsfiMap.xsd
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/ccTsfiMap.xsd 2010-10-17 09:42:09 UTC (rev 108626)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/ccTsfiMap.xsd 2010-10-17 16:01:06 UTC (rev 108627)
@@ -50,7 +50,8 @@
<xsd:enumeration value="CTS"/> <!-- J2EE TCK 1.4 test suite -->
<xsd:enumeration value="EJB3"/> <!-- EJB3 project test suite -->
<xsd:enumeration value="JBM"/> <!-- JBoss Messaging project test suite -->
- <xsd:enumeration value="JBWS"/> <!-- JBoss Webservices project test suite -->
+ <xsd:enumeration value="JBWS-Native"/> <!-- JBoss Webservices - Native project test suite -->
+ <xsd:enumeration value="JBWS-CXF"/> <!-- JBoss Webservices - CXF project test suite -->
</xsd:restriction>
</xsd:simpleType>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml 2010-10-17 09:42:09 UTC (rev 108626)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml 2010-10-17 16:01:06 UTC (rev 108627)
@@ -1359,17 +1359,6 @@
<TSFI>tsfi.cfg.conf.jbossts-properties.xml</TSFI>
</test>
</testCase>
- <!-- testCase name="org.jboss.test.jbossts.ASCrashRecovery02.TestWithJMS">
- <desc></desc>
- <test name="testAction">
- <desc>Test objective:
- Expected result:
- </desc>
- <TSFI>tsfi.api.jta</TSFI>
- <TSFI>tsfi.ann.TransactionAttribute</TSFI>
- <TSFI>tsfi.ann.TransactionManagement</TSFI>
- </test>
- </testCase -->
<testCase name="org.jboss.test.tm.test.TxTimeoutAnnotUnitTestCase">
<desc>Tests for transaction timeout annotation EJB3 version of TxTimeoutUnitTestCase.</desc>
<test name="testOverriddenTimeoutExpires">
@@ -1406,10 +1395,12 @@
<test name="testEjb3Endpoint">
<desc></desc>
<TSFI>tsfi.ann.WebContext</TSFI>
+ <TSFI>tsfi.api.jaxws</TSFI>
</test>
<test name="testPojoEndpoint">
<desc></desc>
<TSFI>tsfi.ann.WebContext</TSFI>
+ <TSFI>tsfi.api.jaxws</TSFI>
</test>
</testCase>
<testCase name="org.jboss.test.security.audit.test.SecurityAuditTestCase">
@@ -1526,58 +1517,6 @@
<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
</test>
</testCase>
- <testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestWebConsoleAuthenticationUnitTestCase">
- <desc></desc>
- <test name="testGet">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- <test name="testPost">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- <test name="testHead">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- <test name="testOptions">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- <test name="testPut">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- <test name="testDelete">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- <test name="testTrace">
- <desc></desc>
- <TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
- <TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
- </test>
- </testCase>
<testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestStatusServletAuthenticationUnitTestCase">
<desc></desc>
<test name="testGet">
@@ -1949,7 +1888,120 @@
<TSFI>tsfi.cfg.jms.messaging-service.xml</TSFI>
</test>
</testCase>
-
+ <testCase name="org.jboss.test.webservice.endpoint.EndpointTestCase">
+ <desc>Test JAXWS Endpoint deployment</desc>
+ <test name="testWSDLAccess">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ <test name="testClientAccess">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ <test name="testServletAccess">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ </testCase>
+ <testCase name="org.jboss.test.webservice.admindevel.ExampleTestCase">
+ <desc>A test for the examples from the JBoss Admin Devel book</desc>
+ <test name="testHelloString">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ <test name="testHelloBean">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ <test name="testHelloArray">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ </testCase>
+ <testCase name="org.jboss.test.webservice.jbws309.JBWS309TestCase">
+ <desc>Authorization Error using JBossWS together with JACC (http://jira.jboss.org/jira/browse/JBWS-309)
+ This test should be run against the jacc configuration.
+ It should also succedd with standard jboss authentication (no jacc) enabled.</desc>
+ <test name="testRoleSecuredSLSB">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ <test name="testBasicSecuredSLSB">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ <test name="testBasicSecuredServiceAccess">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ <test name="testBasicSecuredDIIAccess">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ <test name="testRoleSecuredServiceAccess">
+ <desc></desc>
+ <TSFI>tsfi.api.ws</TSFI>
+ </test>
+ </testCase>
</testSuite>
+ <!--
+ |============================================================================================
+ | jbossws-cxf specific testsuite to TOE Security Functionality Interface mapping.
+ | Note: this testsuite is used only when profile is using CXF webservices implementation.
+ |============================================================================================
+ -->
+ <testSuite name="JBWS-CXF">
+ <testCase name="org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorJSETestCase">
+ <desc>Test a CXF endpoint with provided jbossws-cxf.xml</desc>
+ <test name="testLegalAccess">
+ <desc></desc>
+ <TSFI>tsfi.app.jboss-cxf.xml</TSFI>
+ </test>
+ </testCase>
+ <testCase name="org.jboss.test.ws.jaxws.samples.wsse.SignEncryptTestCase">
+ <desc>WS-Security sign and encrypt test case</desc>
+ <test name="test">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ </testCase>
+ <testCase name="org.jboss.test.ws.jaxws.samples.wsse.SignTestCase">
+ <desc>WS-Security sign test case</desc>
+ <test name="test">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ </testCase>
+ <testCase name="org.jboss.test.ws.jaxws.samples.wsse.UsernameTestCase">
+ <desc>WS-Security username test case</desc>
+ <test name="test">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ <test name="testWrongPassword">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ </testCase>
+ <testCase name="org.jboss.test.ws.jaxws.complex.ComplexTestCase">
+ <desc>A complex JAX-WS test</desc>
+ <test name="testRegistration">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ <test name="testInvoiceRegistration">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ <test name="testOtherPackage">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ <test name="testBulkRegistration">
+ <desc></desc>
+ <TSFI>tsfi.api.jaxws</TSFI>
+ </test>
+ </testCase>
+ </testSuite>
</cc:testCaseMapping>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt 2010-10-17 09:42:09 UTC (rev 108626)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt 2010-10-17 16:01:06 UTC (rev 108627)
@@ -60,10 +60,10 @@
tsfi.cfg.deploy.jmx-invoker-service.xml
tsfi.cfg.juddi.jboss-web.xml
tsfi.cfg.juddi.web.xml
-tsfi.cfg.deploy.web-console.roles.properties
-tsfi.cfg.deploy.web-console.users.properties
-tsfi.cfg.deploy.web-console.jboss-web.xml
-tsfi.cfg.deploy.web-console.web.xml
+#tsfi.cfg.deploy.web-console.roles.properties
+#tsfi.cfg.deploy.web-console.users.properties
+#tsfi.cfg.deploy.web-console.jboss-web.xml
+#tsfi.cfg.deploy.web-console.web.xml
tsfi.cfg.jms.destinations-service.xml
tsfi.cfg.jms.jboss-beans.xml
tsfi.cfg.jms.messaging-service.xml
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/props/messaging-users.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/props/messaging-users.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/props/messaging-users.properties 2010-10-17 16:01:06 UTC (rev 108627)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
More information about the jboss-cvs-commits
mailing list