From c41d1af7168d58c9f2de36b85a76cb521c1bdcbd Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Fri, 23 Aug 2024 22:01:59 -0600 Subject: [PATCH 1/4] Initial jms refactor Related to #1495 Signed-off-by: Scott M Stark --- jms/pom.xml | 26 + jms/rewrite-pom.xml | 767 +++++++++++++++ ...osedQueueConnectionTestsAppclientTest.java | 174 ++++ ...ClosedQueueReceiverTestsAppclientTest.java | 135 +++ .../ClosedQueueSessionTestsAppclientTest.java | 147 +++ ...osedTopicConnectionTestsAppclientTest.java | 167 ++++ .../ClosedTopicSessionTestsAppclientTest.java | 137 +++ .../InvalidDestTestsAppclientTest.java | 118 +++ .../QueueConnTestsAppclientTest.java | 125 +++ .../core/appclient/queuetests/QueueTests.java | 4 +- .../queuetests/QueueTestsAppclientTest.java | 208 ++++ .../core/appclient/topictests/TopicTests.java | 4 +- .../topictests/TopicTestsAppclientTest.java | 208 ++++ .../TxQueueTestsAppclientTest.java | 188 ++++ .../TxTopicTestsAppclientTest.java | 167 ++++ .../BytesMsgQueueTestsAppclientTest.java | 139 +++ .../BytesMsgQueueTestsEjbTest.java | 175 ++++ .../BytesMsgQueueTestsJspTest.java | 158 +++ .../BytesMsgQueueTestsServletTest.java | 151 +++ .../BytesMsgTopicTestsAppclientTest.java | 139 +++ .../BytesMsgTopicTestsEjbTest.java | 175 ++++ .../BytesMsgTopicTestsJspTest.java | 158 +++ .../BytesMsgTopicTestsServletTest.java | 151 +++ ...osedQueueConnectionTestsAppclientTest.java | 448 +++++++++ .../ClosedQueueConnectionTestsEjbTest.java | 486 ++++++++++ .../ClosedQueueConnectionTestsJspTest.java | 468 +++++++++ ...ClosedQueueConnectionTestsServletTest.java | 461 +++++++++ ...ClosedQueueReceiverTestsAppclientTest.java | 160 +++ .../ClosedQueueReceiverTestsEjbTest.java | 196 ++++ .../ClosedQueueReceiverTestsJspTest.java | 179 ++++ .../ClosedQueueReceiverTestsServletTest.java | 172 ++++ .../ClosedQueueSenderTestsAppclientTest.java | 231 +++++ .../ClosedQueueSenderTestsEjbTest.java | 269 +++++ .../ClosedQueueSenderTestsJspTest.java | 251 +++++ .../ClosedQueueSenderTestsServletTest.java | 244 +++++ .../ClosedQueueSessionTestsAppclientTest.java | 425 ++++++++ .../ClosedQueueSessionTestsEjbTest.java | 473 +++++++++ .../ClosedQueueSessionTestsJspTest.java | 450 +++++++++ .../ClosedQueueSessionTestsServletTest.java | 443 +++++++++ ...osedTopicConnectionTestsAppclientTest.java | 427 ++++++++ .../ClosedTopicConnectionTestsEjbTest.java | 465 +++++++++ .../ClosedTopicConnectionTestsJspTest.java | 447 +++++++++ ...ClosedTopicConnectionTestsServletTest.java | 440 +++++++++ ...losedTopicPublisherTestsAppclientTest.java | 217 +++++ .../ClosedTopicPublisherTestsEjbTest.java | 255 +++++ .../ClosedTopicPublisherTestsJspTest.java | 237 +++++ .../ClosedTopicPublisherTestsServletTest.java | 230 +++++ .../ClosedTopicSessionTestsAppclientTest.java | 413 ++++++++ .../ClosedTopicSessionTestsEjbTest.java | 451 +++++++++ .../ClosedTopicSessionTestsJspTest.java | 433 +++++++++ .../ClosedTopicSessionTestsServletTest.java | 426 ++++++++ ...osedTopicSubscriberTestsAppclientTest.java | 167 ++++ .../ClosedTopicSubscriberTestsEjbTest.java | 203 ++++ .../ClosedTopicSubscriberTestsJspTest.java | 186 ++++ ...ClosedTopicSubscriberTestsServletTest.java | 179 ++++ .../ExceptionQueueTestsAppclientTest.java | 265 +++++ .../ExceptionQueueTestsEjbTest.java | 301 ++++++ .../ExceptionQueueTestsJspTest.java | 284 ++++++ .../ExceptionQueueTestsServletTest.java | 277 ++++++ .../ExceptionTopicTestsAppclientTest.java | 244 +++++ .../ExceptionTopicTestsEjbTest.java | 280 ++++++ .../ExceptionTopicTestsJspTest.java | 263 +++++ .../ExceptionTopicTestsServletTest.java | 256 +++++ .../ForeignMsgQueueTestsAppclientTest.java | 201 ++++ .../ForeignMsgQueueTestsEjbTest.java | 251 +++++ .../ForeignMsgQueueTestsJspTest.java | 227 +++++ .../ForeignMsgQueueTestsServletTest.java | 220 +++++ .../ForeignMsgTopicTestsAppclientTest.java | 201 ++++ .../ForeignMsgTopicTestsEjbTest.java | 249 +++++ .../ForeignMsgTopicTestsJspTest.java | 226 +++++ .../ForeignMsgTopicTestsServletTest.java | 219 +++++ .../MapMsgQueueTestsAppclientTest.java | 216 +++++ .../mapMsgQueue/MapMsgQueueTestsEjbTest.java | 254 +++++ .../mapMsgQueue/MapMsgQueueTestsJspTest.java | 236 +++++ .../MapMsgQueueTestsServletTest.java | 229 +++++ .../MapMsgTopicTestsAppclientTest.java | 216 +++++ .../mapMsgTopic/MapMsgTopicTestsEjbTest.java | 252 +++++ .../mapMsgTopic/MapMsgTopicTestsJspTest.java | 235 +++++ .../MapMsgTopicTestsServletTest.java | 228 +++++ .../MessageProducerTestsAppclientTest.java | 160 +++ .../MessageProducerTestsEjbTest.java | 196 ++++ .../MessageProducerTestsJspTest.java | 179 ++++ .../MessageProducerTestsServletTest.java | 172 ++++ .../ObjectMsgQueueTestsAppclientTest.java | 132 +++ .../ObjectMsgQueueTestsEjbTest.java | 168 ++++ .../ObjectMsgQueueTestsJspTest.java | 151 +++ .../ObjectMsgQueueTestsServletTest.java | 144 +++ .../QueueConnectionTestsAppclientTest.java | 132 +++ .../QueueConnectionTestsEjbTest.java | 168 ++++ .../QueueConnectionTestsJspTest.java | 151 +++ .../QueueConnectionTestsServletTest.java | 144 +++ .../QueueHeaderTestsAppclientTest.java | 188 ++++ .../QueueHeaderTestsEjbTest.java | 224 +++++ .../QueueHeaderTestsJspTest.java | 207 ++++ .../QueueHeaderTestsServletTest.java | 200 ++++ .../QueuePropertyTestsAppclientTest.java | 139 +++ .../QueuePropertyTestsEjbTest.java | 175 ++++ .../QueuePropertyTestsJspTest.java | 158 +++ .../QueuePropertyTestsServletTest.java | 151 +++ .../queuetests/QueueTestsAppclientTest.java | 213 ++++ .../core/queuetests/QueueTestsEjbTest.java | 257 +++++ .../core/queuetests/QueueTestsJspTest.java | 236 +++++ .../queuetests/QueueTestsServletTest.java | 229 +++++ .../MsgSelectorQueueTestsAppclientTest.java | 881 +++++++++++++++++ .../MsgSelectorQueueTestsEjbTest.java | 917 ++++++++++++++++++ .../MsgSelectorQueueTestsJspTest.java | 900 +++++++++++++++++ .../MsgSelectorQueueTestsServletTest.java | 893 +++++++++++++++++ .../MsgSelectorTopicTestsAppclientTest.java | 244 +++++ .../MsgSelectorTopicTestsEjbTest.java | 280 ++++++ .../MsgSelectorTopicTestsJspTest.java | 263 +++++ .../MsgSelectorTopicTestsServletTest.java | 256 +++++ .../SessionTestsAppclientTest.java | 174 ++++ .../sessiontests/SessionTestsEjbTest.java | 210 ++++ .../sessiontests/SessionTestsJspTest.java | 193 ++++ .../sessiontests/SessionTestsServletTest.java | 186 ++++ .../StreamMsgQueueTestsAppclientTest.java | 216 +++++ .../StreamMsgQueueTestsEjbTest.java | 254 +++++ .../StreamMsgQueueTestsJspTest.java | 236 +++++ .../StreamMsgQueueTestsServletTest.java | 229 +++++ .../StreamMsgTopicTestsAppclientTest.java | 216 +++++ .../StreamMsgTopicTestsEjbTest.java | 252 +++++ .../StreamMsgTopicTestsJspTest.java | 235 +++++ .../StreamMsgTopicTestsServletTest.java | 228 +++++ .../TopicConnectionTestsAppclientTest.java | 132 +++ .../TopicConnectionTestsEjbTest.java | 168 ++++ .../TopicConnectionTestsJspTest.java | 151 +++ .../TopicConnectionTestsServletTest.java | 144 +++ .../TopicHeaderTestsAppclientTest.java | 181 ++++ .../TopicHeaderTestsEjbTest.java | 217 +++++ .../TopicHeaderTestsJspTest.java | 200 ++++ .../TopicHeaderTestsServletTest.java | 193 ++++ .../TopicPropertyTestsAppclientTest.java | 139 +++ .../TopicPropertyTestsEjbTest.java | 175 ++++ .../TopicPropertyTestsJspTest.java | 158 +++ .../TopicPropertyTestsServletTest.java | 151 +++ .../topictests/TopicTestsAppclientTest.java | 237 +++++ .../core/topictests/TopicTestsEjbTest.java | 273 ++++++ .../core/topictests/TopicTestsJspTest.java | 256 +++++ .../topictests/TopicTestsServletTest.java | 249 +++++ .../jmsconsumertests/ClientAppclientTest.java | 133 +++ .../ClientAppclientTest.java | 249 +++++ .../ClientAppclientTest.java | 240 +++++ .../ClientAppclientTest.java | 150 +++ .../ClientAppclientTest.java | 128 +++ .../ClientAppclientTest.java | 261 +++++ .../ClientAppclientTest.java | 174 ++++ .../connectionfactorytests/ClientEjbTest.java | 210 ++++ .../connectionfactorytests/ClientJspTest.java | 193 ++++ .../ClientServletTest.java | 186 ++++ .../jmsconsumertests/ClientAppclientTest.java | 188 ++++ .../jmsconsumertests/ClientEjbTest.java | 224 +++++ .../jmsconsumertests/ClientJspTest.java | 207 ++++ .../jmsconsumertests/ClientServletTest.java | 200 ++++ .../ClientAppclientTest.java | 202 ++++ .../jmscontextqueuetests/ClientEjbTest.java | 238 +++++ .../jmscontextqueuetests/ClientJspTest.java | 221 +++++ .../ClientServletTest.java | 214 ++++ .../ClientAppclientTest.java | 286 ++++++ .../jmscontexttopictests/ClientEjbTest.java | 322 ++++++ .../jmscontexttopictests/ClientJspTest.java | 305 ++++++ .../ClientServletTest.java | 298 ++++++ .../ClientAppclientTest.java | 328 +++++++ .../jmsproducerqueuetests/ClientEjbTest.java | 364 +++++++ .../jmsproducerqueuetests/ClientJspTest.java | 347 +++++++ .../ClientServletTest.java | 340 +++++++ .../ClientAppclientTest.java | 328 +++++++ .../jmsproducertopictests/ClientEjbTest.java | 364 +++++++ .../jmsproducertopictests/ClientJspTest.java | 347 +++++++ .../ClientServletTest.java | 340 +++++++ .../core20/messageproducertests/Client.java | 2 +- .../ClientAppclientTest.java | 294 ++++++ .../messageproducertests/ClientEjbTest.java | 330 +++++++ .../messageproducertests/ClientJspTest.java | 313 ++++++ .../ClientServletTest.java | 306 ++++++ .../ClientAppclientTest.java | 347 +++++++ .../runtimeexceptiontests/ClientEjbTest.java | 382 ++++++++ .../runtimeexceptiontests/ClientJspTest.java | 362 +++++++ .../ClientServletTest.java | 355 +++++++ .../sessiontests/ClientAppclientTest.java | 286 ++++++ .../core20/sessiontests/ClientEjbTest.java | 322 ++++++ .../core20/sessiontests/ClientJspTest.java | 305 ++++++ .../sessiontests/ClientServletTest.java | 298 ++++++ .../jms/ee/ejb/queueCMTTests/ClientTest.java | 216 +++++ .../jms/ee/ejb/sessionQtests/ClientTest.java | 144 +++ .../jms/ee/ejb/sessionTtests/ClientTest.java | 137 +++ .../ee/ejbweb/xa/TransactionTestsEjbTest.java | 221 +++++ .../ee/ejbweb/xa/TransactionTestsJspTest.java | 205 ++++ .../xa/TransactionTestsServletTest.java | 198 ++++ .../jms/ee/mdb/mdb_exceptQ/ClientTest.java | 198 ++++ .../jms/ee/mdb/mdb_exceptT/ClientTest.java | 198 ++++ .../jms/ee/mdb/mdb_msgHdrQ/ClientTest.java | 211 ++++ .../jms/ee/mdb/mdb_msgHdrT/ClientTest.java | 211 ++++ .../jms/ee/mdb/mdb_msgPropsQ/ClientTest.java | 145 +++ .../jms/ee/mdb/mdb_msgPropsT/ClientTest.java | 145 +++ .../jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java | 217 +++++ .../jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java | 217 +++++ .../jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java | 181 ++++ .../jms/ee/mdb/mdb_msgTypesT1/ClientTest.java | 217 +++++ .../jms/ee/mdb/mdb_msgTypesT2/ClientTest.java | 217 +++++ .../jms/ee/mdb/mdb_msgTypesT3/ClientTest.java | 181 ++++ .../tests/jms/ee/mdb/mdb_rec/ClientTest.java | 194 ++++ .../tests/jms/ee/mdb/mdb_sndQ/ClientTest.java | 163 ++++ .../jms/ee/mdb/mdb_sndToQueue/ClientTest.java | 163 ++++ .../jms/ee/mdb/mdb_sndToTopic/ClientTest.java | 164 ++++ .../jms/ee/mdb/mdb_synchrec/ClientTest.java | 137 +++ .../ts/tests/jms/ee/mdb/xa/ClientTest.java | 192 ++++ .../jms/ee20/cditests/ejbweb/ClientTest.java | 247 +++++ .../jms/ee20/cditests/mdb/ClientTest.java | 142 +++ .../ee20/cditests/usecases/ClientTest.java | 198 ++++ .../selectorauto/annotated/ClientTest.java | 155 +++ .../selectorauto/descriptor/ClientTest.java | 156 +++ .../selectordups/annotated/ClientTest.java | 155 +++ .../selectordups/descriptor/ClientTest.java | 156 +++ .../annotated/ClientTest.java | 144 +++ .../descriptor/ClientTest.java | 145 +++ .../annotated/ClientTest.java | 156 +++ .../descriptor/ClientTest.java | 157 +++ .../annotated/ClientTest.java | 156 +++ .../descriptor/ClientTest.java | 157 +++ .../resourcedefs/annotations/ClientTest.java | 219 +++++ .../descriptor/ClientAppclientTest.java | 139 +++ .../descriptor/ClientEjbTest.java | 175 ++++ .../descriptor/ClientJspTest.java | 158 +++ .../descriptor/ClientServletTest.java | 151 +++ 224 files changed, 53666 insertions(+), 5 deletions(-) create mode 100644 jms/rewrite-pom.xml create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java create mode 100644 jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java diff --git a/jms/pom.xml b/jms/pom.xml index 1457b372a8..df80ebf386 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -57,6 +57,32 @@ jakarta.annotation jakarta.annotation-api + + + org.junit.jupiter + junit-jupiter + + + org.jboss.arquillian.junit5 + arquillian-junit5-container + + + org.jboss.shrinkwrap + shrinkwrap-api + + + org.jboss.arquillian.container + arquillian-container-test-api + + + jakarta.tck.arquillian + arquillian-protocol-common + ${arquillian.jakarta.tck.version} + + + jakarta.tck.arquillian + tck-porting-lib + diff --git a/jms/rewrite-pom.xml b/jms/rewrite-pom.xml new file mode 100644 index 0000000000..bfce6a471d --- /dev/null +++ b/jms/rewrite-pom.xml @@ -0,0 +1,767 @@ + + + + 4.0.0 + + + org.eclipse.ee4j + project + 1.0.7 + + + jakarta.tck + jms-rewrite + 11.0.0-SNAPSHOT + pom + project + project + + + 1.10.11 + 1.8.0.Final + + + 4.0.0 + + 2.0.0 + + 3.2.0-M2 + 2.0.0 + + 2.1.1 + 2.0.0 + 2.1.0 + + 2.0.0 + + 4.0.0 + 6.0.0-M1 + 3.0.0 + 2.0.1 + + 2.1.0 + 3.0.0 + 2.0.0 + + 2.0.0 + + 2.0.0 + 6.0.0 + + 2.0.0 + 3.0.0 + + 3.1.0 + 3.0.0 + 3.0.0 + 4.0.0 + 5.0 + 3.0.0 + + 3.1.0 + 3.0.0 + + 2.1.1 + + 3.1.0 + + 2.0.0 + 17 + ${maven.compiler.release} + UTF-8 + UTF-8 + 2.0.0 + false + 8.24.0 + 1.9.1.Final + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + + 2.2.0 + 2.2.0 + + + + + + ${project.groupId} + appclient + ${project.version} + + + + ${project.groupId} + runtime + ${project.version} + + + + ${project.groupId} + assembly + ${project.version} + + + + ${project.groupId} + common + ${project.version} + + + + ${project.groupId} + ejb30 + ${project.version} + + + ${project.groupId} + ejb30-ws + ${project.version} + + + ${project.groupId} + ejb32 + ${project.version} + + + + ${project.groupId} + ejb + ${project.version} + + + + ${project.groupId} + concurrency + ${project.version} + + + + ${project.groupId} + connector + ${project.version} + + + + ${project.groupId} + el + ${project.version} + + + + ${project.groupId} + integration + ${project.version} + + + + ${project.groupId} + internal + ${project.version} + + + + ${project.groupId} + javaee + ${project.version} + + + + ${project.groupId} + javamail + ${project.version} + + + + ${project.groupId} + jaxrs-platform-tck + ${project.version} + + + + ${project.groupId} + jaxws + ${project.version} + + + + ${project.groupId} + jaxws-common + ${project.version} + + + + ${project.groupId} + jdbc + ${project.version} + + + + ${project.groupId} + jms + ${project.version} + + + + ${project.groupId} + jpa + ${project.version} + + + + ${project.groupId} + jsf + ${project.version} + + + + ${project.groupId} + jsonb + ${project.version} + + + + ${project.groupId} + jsonp + ${project.version} + + + + ${project.groupId} + jsp + ${project.version} + + + + ${project.groupId} + jstl + ${project.version} + + + + ${project.groupId} + jta + ${project.version} + + + + ${project.groupId} + jws + ${project.version} + + + + ${project.groupId} + jws-common + ${project.version} + + + + ${project.groupId} + libutil + ${project.version} + + + + ${project.groupId} + saaj + ${project.version} + + + + ${project.groupId} + samples + ${project.version} + + + + ${project.groupId} + servlet + ${project.version} + + + + ${project.groupId} + signaturetest + ${project.version} + + + + ${project.groupId} + webservices12 + ${project.version} + + + + ${project.groupId} + webservices13 + ${project.version} + + + + ${project.groupId} + websocket + ${project.version} + + + ${project.groupId} + xa + ${project.version} + + + commons-httpclient + commons-httpclient + 3.1 + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + ${project.groupId} + web-servlet + ${project.version} + + + ${project.groupId} + web-jsp + ${project.version} + + + + org.junit + junit-bom + 5.9.1 + pom + import + + + + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + pom + import + + + + org.jboss.arquillian.container + arquillian-container-test-spi + ${arquillian.version} + + + + org.jboss.arquillian.junit + arquillian-junit-container + ${version.org.jboss.arquillian.core} + + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation-api.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api.version} + + + org.apache.ant + ant + ${ant.version} + + + commons-io + commons-io + 2.10.0 + + + org.apache.commons + commons-lang3 + 3.9 + + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication-api.version} + + + jakarta.authorization + jakarta.authorization-api + ${jakarta.authorization-api.version} + + + jakarta.batch + jakarta.batch-api + ${jakarta.batch-api.version} + + + jakarta.ejb + jakarta.ejb-api + ${jakarta.ejb-api.version} + + + jakarta.el + jakarta.el-api + ${jakarta.el-api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${cdi-api.version} + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + ${concurrent-api.version} + + + jakarta.faces + jakarta.faces-api + ${jakarta.faces-api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject-api.version} + + + jakarta.jws + jakarta.jws-api + ${jakarta.jws-api.version} + + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor-api.version} + + + jakarta.jms + jakarta.jms-api + ${jms-api.version} + + + jakarta.json.bind + jakarta.json.bind-api + ${json.bind-api.version} + + + jakarta.json + jakarta.json-api + ${jsonp-api.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta.mail-api.version} + + + jakarta.persistence + jakarta.persistence-api + ${jakarta-persistence-api.version} + + + jakarta.resource + jakarta.resource-api + ${jakarta.resource-api.version} + + + jakarta.security.enterprise + jakarta.security.enterprise-api + ${jakarta.security.enterprise-api.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + ${jsp-api.version} + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jstl-api.version} + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.validation + jakarta.validation-api + ${jakarta.validation-api.version} + + + jakarta.websocket + jakarta.websocket-client-api + ${websocket-client-api.version} + + + jakarta.websocket + jakarta.websocket-api + ${websocket-api.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} + + + jakarta.xml.soap + jakarta.xml.soap-api + ${jakarta.xml.soap-api.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.ws-api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} + + + com.sun.xml.bind + jaxb-osgi + ${jaxb-osgi.version} + + + + org.jboss.spec.javax.rmi + jboss-rmi-api_1.0_spec + 1.0.6.Final + + + org.jboss.arquillian.container + arquillian-container-test-api + 1.8.0.Final + + + + + + + + org.junit.jupiter + junit-jupiter + test + + + + + + + + false + + + true + + oss.sonatype.org + Jetty Snapshot Repository + https://oss.sonatype.org/content/repositories/jetty-snapshots/ + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.12.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + com.sun.xml.ws + jaxws-maven-plugin + 4.0.0 + + + org.apache.maven.plugins + maven-dependency-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + forked-path + clean install + -Drelease -Dtck-audit + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + none + + + + org.codehaus.mojo + exec-maven-plugin + 3.2.0 + + + ${java.home} + ${java.home} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + org.apache.maven.plugins + maven-install-plugin + 3.0.0-M1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + + + + + + org.openrewrite.maven + rewrite-maven-plugin + 5.32.1 + + + tck.jakarta.platform.rewrite.GenerateNewTestClassRecipe + + + + + jakarta.tck + tck-rewrite-tools + 1.0.0-SNAPSHOT + + + org.openrewrite + rewrite-core + 8.24.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + org.openrewrite.recipe + rewrite-testing-frameworks + 2.6.0 + + + org.openrewrite.recipe + rewrite-github-actions + 2.1.7 + + + org.openrewrite + rewrite-java-17 + ${version.openrewrite} + + + org.openrewrite + rewrite-test + ${version.openrewrite} + + + org.openrewrite + rewrite-java-test + ${version.openrewrite} + + + + + + + + diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java new file mode 100644 index 0000000000..cd05a5f29c --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java @@ -0,0 +1,174 @@ +package com.sun.ts.tests.jms.core.appclient.closedQueueConnection; + +import com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueConnectionTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests { + static final String VEHICLE_ARCHIVE = "closedQueueConnection_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueConnection_appclient_vehicle: + closedQueueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle: + closedQueueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueConnection_jsp_vehicle: + closedQueueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueConnection_servlet_vehicle: + closedQueueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/closedQueueConnection/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueConnection_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueConnection_appclient_vehicle_client.jar"); + // The class files + closedQueueConnection_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$1.class"); + closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$2.class"); + closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$1.class"); + closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$2.class"); + + // The application-client.xml descriptor + URL resURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueConnection_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueConnection_appclient_vehicle_client, ClosedQueueConnectionTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueConnection_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueConnection_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueConnection_appclient_vehicle_ear.addAsModule(closedQueueConnection_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/"); + if(earResURL != null) { + closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueConnection_appclient_vehicle_ear, ClosedQueueConnectionTests.class, earResURL); + return closedQueueConnection_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetClientIDTest() throws java.lang.Exception { + super.closedQueueConnectionSetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetExceptionListenerTest() throws java.lang.Exception { + super.closedQueueConnectionSetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetMessageListenerTest() throws java.lang.Exception { + super.closedQueueConnectionGetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetMessageListenerTest() throws java.lang.Exception { + super.closedQueueConnectionSetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetExceptionListenerTest() throws java.lang.Exception { + super.closedQueueConnectionGetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionStopTest() throws java.lang.Exception { + super.closedQueueConnectionStopTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionAckTest() throws java.lang.Exception { + super.closedQueueConnectionAckTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java new file mode 100644 index 0000000000..f7eb7d7a25 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java @@ -0,0 +1,135 @@ +package com.sun.ts.tests.jms.core.appclient.closedQueueReceiver; + +import com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueReceiverTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests { + static final String VEHICLE_ARCHIVE = "closedQueueReceiver_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueReceiver_appclient_vehicle: + closedQueueReceiver_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle: + closedQueueReceiver_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueReceiver_jsp_vehicle: + closedQueueReceiver_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueReceiver_servlet_vehicle: + closedQueueReceiver_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueReceiver_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueReceiver_appclient_vehicle_client.jar"); + // The class files + closedQueueReceiver_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + closedQueueReceiver_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests$1.class"); + closedQueueReceiver_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests$1.class"); + + // The application-client.xml descriptor + URL resURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueReceiver_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueReceiver_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueReceiver_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueReceiverTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueReceiver_appclient_vehicle_client, ClosedQueueReceiverTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueReceiver_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueReceiver_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueReceiver_appclient_vehicle_ear.addAsModule(closedQueueReceiver_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/"); + if(earResURL != null) { + closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueReceiver_appclient_vehicle_ear, ClosedQueueReceiverTests.class, earResURL); + return closedQueueReceiver_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverGetMessageListenerTest() throws java.lang.Exception { + super.closedQueueReceiverGetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverSetMessageListenerTest() throws java.lang.Exception { + super.closedQueueReceiverSetMessageListenerTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java new file mode 100644 index 0000000000..3cca3aca4a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java @@ -0,0 +1,147 @@ +package com.sun.ts.tests.jms.core.appclient.closedQueueSession; + +import com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSessionTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests { + static final String VEHICLE_ARCHIVE = "closedQueueSession_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSession_appclient_vehicle: + closedQueueSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle: + closedQueueSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSession_jsp_vehicle: + closedQueueSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSession_servlet_vehicle: + closedQueueSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/closedQueueSession/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueSession_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueSession_appclient_vehicle_client.jar"); + // The class files + closedQueueSession_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + closedQueueSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests$1.class"); + closedQueueSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests$1.class"); + + // The application-client.xml descriptor + URL resURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueSession_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueSessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueSession_appclient_vehicle_client, ClosedQueueSessionTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueSession_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSession_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSession_appclient_vehicle_ear.addAsModule(closedQueueSession_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueSession/"); + if(earResURL != null) { + closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSession_appclient_vehicle_ear, ClosedQueueSessionTests.class, earResURL); + return closedQueueSession_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetMessageListenerTest() throws java.lang.Exception { + super.closedQueueSessionGetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSetMessageListenerTest() throws java.lang.Exception { + super.closedQueueSessionSetMessageListenerTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java new file mode 100644 index 0000000000..32c67637a5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java @@ -0,0 +1,167 @@ +package com.sun.ts.tests.jms.core.appclient.closedTopicConnection; + +import com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicConnectionTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests { + static final String VEHICLE_ARCHIVE = "closedTopicConnection_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicConnection_appclient_vehicle: + closedTopicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle: + closedTopicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicConnection_jsp_vehicle: + closedTopicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicConnection_servlet_vehicle: + closedTopicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/closedTopicConnection/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicConnection_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicConnection_appclient_vehicle_client.jar"); + // The class files + closedTopicConnection_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$1.class"); + closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$2.class"); + closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$1.class"); + closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$2.class"); + + // The application-client.xml descriptor + URL resURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedTopicConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicConnection_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicConnection_appclient_vehicle_client, ClosedTopicConnectionTests.class, resURL); + + // Ear + EnterpriseArchive closedTopicConnection_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicConnection_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicConnection_appclient_vehicle_ear.addAsModule(closedTopicConnection_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/"); + if(earResURL != null) { + closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicConnection_appclient_vehicle_ear, ClosedTopicConnectionTests.class, earResURL); + return closedTopicConnection_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetExceptionListenerTest() throws java.lang.Exception { + super.closedTopicConnectionGetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetClientIDTest() throws java.lang.Exception { + super.closedTopicConnectionSetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetExceptionListenerTest() throws java.lang.Exception { + super.closedTopicConnectionSetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetMessageListenerTest() throws java.lang.Exception { + super.closedTopicConnectionGetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetMessageListenerTest() throws java.lang.Exception { + super.closedTopicConnectionSetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionStopTest() throws java.lang.Exception { + super.closedTopicConnectionStopTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java new file mode 100644 index 0000000000..c078c3fe3e --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java @@ -0,0 +1,137 @@ +package com.sun.ts.tests.jms.core.appclient.closedTopicSession; + +import com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSessionTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests { + static final String VEHICLE_ARCHIVE = "closedTopicSession_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSession_appclient_vehicle: + closedTopicSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle: + closedTopicSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSession_jsp_vehicle: + closedTopicSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSession_servlet_vehicle: + closedTopicSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/closedTopicSession/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicSession_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicSession_appclient_vehicle_client.jar"); + // The class files + closedTopicSession_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + closedTopicSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests$1.class"); + closedTopicSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests$1.class"); + + // The application-client.xml descriptor + URL resURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedTopicSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicSession_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicSessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicSession_appclient_vehicle_client, ClosedTopicSessionTests.class, resURL); + + // Ear + EnterpriseArchive closedTopicSession_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSession_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSession_appclient_vehicle_ear.addAsModule(closedTopicSession_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicSession/"); + if(earResURL != null) { + closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSession_appclient_vehicle_ear, ClosedTopicSessionTests.class, earResURL); + return closedTopicSession_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSetMessageListenerTest() throws java.lang.Exception { + super.closedTopicSessionSetMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetMessageListenerTest() throws java.lang.Exception { + super.closedTopicSessionGetMessageListenerTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java new file mode 100644 index 0000000000..256110efe7 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java @@ -0,0 +1,118 @@ +package com.sun.ts.tests.jms.core.appclient.invalidDest; + +import com.sun.ts.tests.jms.core.appclient.invalidDest.InvalidDestTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class InvalidDestTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.invalidDest.InvalidDestTests { + static final String VEHICLE_ARCHIVE = "invalidDest_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + invalidDest_appclient_vehicle: + invalidDest_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/invalidDest/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive invalidDest_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "invalidDest_appclient_vehicle_client.jar"); + // The class files + invalidDest_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.appclient.invalidDest.InvalidDestTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = InvalidDestTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + invalidDest_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = InvalidDestTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + invalidDest_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + invalidDest_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + InvalidDestTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(invalidDest_appclient_vehicle_client, InvalidDestTests.class, resURL); + + // Ear + EnterpriseArchive invalidDest_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "invalidDest_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + invalidDest_appclient_vehicle_ear.addAsModule(invalidDest_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = InvalidDestTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/invalidDest/"); + if(earResURL != null) { + invalidDest_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = InvalidDestTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/invalidDest/.ear.sun-application.xml"); + if(earResURL != null) { + invalidDest_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(invalidDest_appclient_vehicle_ear, InvalidDestTests.class, earResURL); + return invalidDest_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationTests() throws java.lang.Exception { + super.invalidDestinationTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java new file mode 100644 index 0000000000..743fe95a05 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java @@ -0,0 +1,125 @@ +package com.sun.ts.tests.jms.core.appclient.queueconn; + +import com.sun.ts.tests.jms.core.appclient.queueconn.QueueConnTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueConnTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.queueconn.QueueConnTests { + static final String VEHICLE_ARCHIVE = "queueconn_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + queueconn_appclient_vehicle: + queueconn_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/queueconn/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueconn_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueconn_appclient_vehicle_client.jar"); + // The class files + queueconn_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.appclient.queueconn.QueueConnTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueueConnTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + queueconn_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueConnTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueconn_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueconn_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueConnTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueconn_appclient_vehicle_client, QueueConnTests.class, resURL); + + // Ear + EnterpriseArchive queueconn_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueconn_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueconn_appclient_vehicle_ear.addAsModule(queueconn_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueConnTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queueconn/"); + if(earResURL != null) { + queueconn_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueConnTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queueconn/.ear.sun-application.xml"); + if(earResURL != null) { + queueconn_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueconn_appclient_vehicle_ear, QueueConnTests.class, earResURL); + return queueconn_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void connStoppedQueueTest() throws java.lang.Exception { + super.connStoppedQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionNoForcedAckTest() throws java.lang.Exception { + super.closedQueueConnectionNoForcedAckTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTests.java index 8cac346b93..672e58790d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTests.java @@ -563,7 +563,7 @@ public void onException(JMSException e) { } } - private static class AutoAckMsgListener implements MessageListener { + public static class AutoAckMsgListener implements MessageListener { private boolean passed; QueueSession session; @@ -1094,7 +1094,7 @@ public void queueRequestorExceptionTests() throws Exception { } } - private static class RequestorMsgListener implements MessageListener { + public static class RequestorMsgListener implements MessageListener { QueueSession session = null; boolean pass = false; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java new file mode 100644 index 0000000000..89121a3d39 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java @@ -0,0 +1,208 @@ +package com.sun.ts.tests.jms.core.appclient.queuetests; + +import com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests { + static final String VEHICLE_ARCHIVE = "queuetests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + queuetests_appclient_vehicle: + queuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle: + queuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queuetests_jsp_vehicle: + queuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queuetests_servlet_vehicle: + queuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/queuetests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queuetests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queuetests_appclient_vehicle_client.jar"); + // The class files + queuetests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests.RequestorMsgListener.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests.AutoAckMsgListener.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class + ); + queuetests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests$1.class"); + queuetests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests$1.class"); + + // The application-client.xml descriptor + URL resURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + queuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queuetests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queuetests_appclient_vehicle_client, QueueTests.class, resURL); + + // Ear + EnterpriseArchive queuetests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queuetests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queuetests_appclient_vehicle_ear.addAsModule(queuetests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queuetests/"); + if(earResURL != null) { + queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queuetests/.ear.sun-application.xml"); + if(earResURL != null) { + queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queuetests_appclient_vehicle_ear, QueueTests.class, earResURL); + return queuetests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void receiveNullClosedSessionQueueTest() throws java.lang.Exception { + super.receiveNullClosedSessionQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setClientIDLateQueueTest() throws java.lang.Exception { + super.setClientIDLateQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void autoAckMsgListenerQueueTest() throws java.lang.Exception { + super.autoAckMsgListenerQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void serialMsgListenerQueueTest() throws java.lang.Exception { + super.serialMsgListenerQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetChangeClientIDQueueTest() throws java.lang.Exception { + super.setGetChangeClientIDQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetExceptionListenerTest() throws java.lang.Exception { + super.setGetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void reverseReceiveClientAckTest() throws java.lang.Exception { + super.reverseReceiveClientAckTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void clientAckQueueTest() throws java.lang.Exception { + super.clientAckQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nonAckMsgsRedeliveredQueueTest() throws java.lang.Exception { + super.nonAckMsgsRedeliveredQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueRequestorSimpleSendAndRecvTest() throws java.lang.Exception { + super.queueRequestorSimpleSendAndRecvTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueRequestorExceptionTests() throws java.lang.Exception { + super.queueRequestorExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTests.java index e44647eb51..eaa05bef46 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTests.java @@ -559,7 +559,7 @@ public void onException(JMSException e) { } } - private static class AutoAckMsgListener implements MessageListener { + public static class AutoAckMsgListener implements MessageListener { private boolean passed; TopicSession session; @@ -1071,7 +1071,7 @@ public void topicRequestorExceptionTests() throws Exception { } } - private static class RequestorMsgListener implements MessageListener { + public static class RequestorMsgListener implements MessageListener { TopicSession session = null; boolean pass = false; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java new file mode 100644 index 0000000000..9fb2790945 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java @@ -0,0 +1,208 @@ +package com.sun.ts.tests.jms.core.appclient.topictests; + +import com.sun.ts.tests.jms.core.appclient.topictests.TopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.topictests.TopicTests { + static final String VEHICLE_ARCHIVE = "topictests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + topictests_appclient_vehicle: + topictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle: + topictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topictests_jsp_vehicle: + topictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topictests_servlet_vehicle: + topictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/topictests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topictests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topictests_appclient_vehicle_client.jar"); + // The class files + topictests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core.appclient.topictests.TopicTests.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.appclient.topictests.TopicTests.RequestorMsgListener.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.core.appclient.topictests.TopicTests.AutoAckMsgListener.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class + ); + topictests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.topictests.TopicTests$1.class"); + topictests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.topictests.TopicTests$1.class"); + + // The application-client.xml descriptor + URL resURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + topictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topictests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topictests_appclient_vehicle_client, TopicTests.class, resURL); + + // Ear + EnterpriseArchive topictests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topictests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topictests_appclient_vehicle_ear.addAsModule(topictests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/topictests/"); + if(earResURL != null) { + topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/topictests/.ear.sun-application.xml"); + if(earResURL != null) { + topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topictests_appclient_vehicle_ear, TopicTests.class, earResURL); + return topictests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void receiveNullClosedSessionTopicTest() throws java.lang.Exception { + super.receiveNullClosedSessionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setClientIDLateTopicTest() throws java.lang.Exception { + super.setClientIDLateTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void autoAckMsgListenerTopicTest() throws java.lang.Exception { + super.autoAckMsgListenerTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void serialMsgListenerTopicTest() throws java.lang.Exception { + super.serialMsgListenerTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetChangeClientIDTopicTest() throws java.lang.Exception { + super.setGetChangeClientIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetExceptionListenerTest() throws java.lang.Exception { + super.setGetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void reverseReceiveClientAckTest() throws java.lang.Exception { + super.reverseReceiveClientAckTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void clientAckTopicTest() throws java.lang.Exception { + super.clientAckTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nonAckMsgsRedeliveredTopicTest() throws java.lang.Exception { + super.nonAckMsgsRedeliveredTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicRequestorSimpleSendAndRecvTest() throws java.lang.Exception { + super.topicRequestorSimpleSendAndRecvTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicRequestorExceptionTests() throws java.lang.Exception { + super.topicRequestorExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java new file mode 100644 index 0000000000..9cf7b10593 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java @@ -0,0 +1,188 @@ +package com.sun.ts.tests.jms.core.appclient.txqueuetests; + +import com.sun.ts.tests.jms.core.appclient.txqueuetests.TxQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TxQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.txqueuetests.TxQueueTests { + static final String VEHICLE_ARCHIVE = "txqueuetests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + txqueuetests_appclient_vehicle: + txqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/txqueuetests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive txqueuetests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "txqueuetests_appclient_vehicle_client.jar"); + // The class files + txqueuetests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.core.appclient.txqueuetests.TxQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TxQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + txqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TxQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + txqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + txqueuetests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TxQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(txqueuetests_appclient_vehicle_client, TxQueueTests.class, resURL); + + // Ear + EnterpriseArchive txqueuetests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "txqueuetests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + txqueuetests_appclient_vehicle_ear.addAsModule(txqueuetests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TxQueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txqueuetests/"); + if(earResURL != null) { + txqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TxQueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + txqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(txqueuetests_appclient_vehicle_ear, TxQueueTests.class, earResURL); + return txqueuetests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void simpleSendReceiveTxQueueTest() throws java.lang.Exception { + super.simpleSendReceiveTxQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void commitAckMsgQueueTest() throws java.lang.Exception { + super.commitAckMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void rollbackRecoverQueueTest() throws java.lang.Exception { + super.rollbackRecoverQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void redeliveredFlagTxQueueTest() throws java.lang.Exception { + super.redeliveredFlagTxQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRollbackOnSessionCloseRecQTest() throws java.lang.Exception { + super.transactionRollbackOnSessionCloseRecQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRollbackOnSendQTest() throws java.lang.Exception { + super.transactionRollbackOnSendQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRollbackOnRecQTest() throws java.lang.Exception { + super.transactionRollbackOnRecQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void txRollbackOnConnectionCloseRecQTest() throws java.lang.Exception { + super.txRollbackOnConnectionCloseRecQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void txCloseRolledBackSessionRecQTest() throws java.lang.Exception { + super.txCloseRolledBackSessionRecQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void txMultiQTest() throws java.lang.Exception { + super.txMultiQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void commitRollbackMultiMsgsTest() throws java.lang.Exception { + super.commitRollbackMultiMsgsTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java new file mode 100644 index 0000000000..e28c0c0a1a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java @@ -0,0 +1,167 @@ +package com.sun.ts.tests.jms.core.appclient.txtopictests; + +import com.sun.ts.tests.jms.core.appclient.txtopictests.TxTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TxTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.appclient.txtopictests.TxTopicTests { + static final String VEHICLE_ARCHIVE = "txTopicTests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + txTopicTests_appclient_vehicle: + txTopicTests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/appclient/txtopictests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive txTopicTests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "txTopicTests_appclient_vehicle_client.jar"); + // The class files + txTopicTests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core.appclient.txtopictests.TxTopicTests.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TxTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + txTopicTests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TxTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + txTopicTests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + txTopicTests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TxTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(txTopicTests_appclient_vehicle_client, TxTopicTests.class, resURL); + + // Ear + EnterpriseArchive txTopicTests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "txTopicTests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + txTopicTests_appclient_vehicle_ear.addAsModule(txTopicTests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TxTopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txtopictests/"); + if(earResURL != null) { + txTopicTests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TxTopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txtopictests/.ear.sun-application.xml"); + if(earResURL != null) { + txTopicTests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(txTopicTests_appclient_vehicle_ear, TxTopicTests.class, earResURL); + return txTopicTests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void commitAckMsgTopicTest() throws java.lang.Exception { + super.commitAckMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void rollbackRecoverTopicTest() throws java.lang.Exception { + super.rollbackRecoverTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void redeliveredFlagTxTopicTest() throws java.lang.Exception { + super.redeliveredFlagTxTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRollbackOnSessionCloseReceiveTopicTest() throws java.lang.Exception { + super.transactionRollbackOnSessionCloseReceiveTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRollbackOnPublishTopicTest() throws java.lang.Exception { + super.transactionRollbackOnPublishTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRollbackOnRecTopicTest() throws java.lang.Exception { + super.transactionRollbackOnRecTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void txRollbackOnConnectionCloseReceiveTopicTest() throws java.lang.Exception { + super.txRollbackOnConnectionCloseReceiveTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void commitRollbackMultiMsgsTest() throws java.lang.Exception { + super.commitRollbackMultiMsgsTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java new file mode 100644 index 0000000000..b32d9d8c76 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java @@ -0,0 +1,139 @@ +package com.sun.ts.tests.jms.core.bytesMsgQueue; + +import com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests { + static final String VEHICLE_ARCHIVE = "bytesMsgQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgQueue_appclient_vehicle: + bytesMsgQueue_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle: + bytesMsgQueue_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgQueue_jsp_vehicle: + bytesMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgQueue_servlet_vehicle: + bytesMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/bytesMsgQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive bytesMsgQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "bytesMsgQueue_appclient_vehicle_client.jar"); + // The class files + bytesMsgQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + bytesMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = BytesMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + bytesMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + bytesMsgQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + BytesMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(bytesMsgQueue_appclient_vehicle_client, BytesMsgQueueTests.class, resURL); + + // Ear + EnterpriseArchive bytesMsgQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgQueue_appclient_vehicle_ear.addAsModule(bytesMsgQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); + if(earResURL != null) { + bytesMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgQueue_appclient_vehicle_ear, BytesMsgQueueTests.class, earResURL); + return bytesMsgQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void bytesMsgNullStreamQTest() throws java.lang.Exception { + super.bytesMsgNullStreamQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bytesMessageQTestsFullMsg() throws java.lang.Exception { + super.bytesMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bytesMessageQNotWriteable() throws java.lang.Exception { + super.bytesMessageQNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java new file mode 100644 index 0000000000..651c8b930f --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java @@ -0,0 +1,175 @@ +package com.sun.ts.tests.jms.core.bytesMsgQueue; + +import com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgQueueTestsEjbTest extends com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests { + static final String VEHICLE_ARCHIVE = "bytesMsgQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgQueue_appclient_vehicle: + bytesMsgQueue_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle: + bytesMsgQueue_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgQueue_jsp_vehicle: + bytesMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgQueue_servlet_vehicle: + bytesMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/bytesMsgQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive bytesMsgQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "bytesMsgQueue_ejb_vehicle_client.jar"); + // The class files + bytesMsgQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + bytesMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = BytesMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + bytesMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + bytesMsgQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + BytesMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(bytesMsgQueue_ejb_vehicle_client, BytesMsgQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive bytesMsgQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "bytesMsgQueue_ejb_vehicle_ejb.jar"); + // The class files + bytesMsgQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = BytesMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + bytesMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = BytesMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + bytesMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(bytesMsgQueue_ejb_vehicle_ejb, BytesMsgQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive bytesMsgQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgQueue_ejb_vehicle_ear.addAsModule(bytesMsgQueue_ejb_vehicle_ejb); + bytesMsgQueue_ejb_vehicle_ear.addAsModule(bytesMsgQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); + if(earResURL != null) { + bytesMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgQueue_ejb_vehicle_ear, BytesMsgQueueTests.class, earResURL); + return bytesMsgQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void bytesMsgNullStreamQTest() throws java.lang.Exception { + super.bytesMsgNullStreamQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bytesMessageQTestsFullMsg() throws java.lang.Exception { + super.bytesMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bytesMessageQNotWriteable() throws java.lang.Exception { + super.bytesMessageQNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java new file mode 100644 index 0000000000..1d3b021bdd --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java @@ -0,0 +1,158 @@ +package com.sun.ts.tests.jms.core.bytesMsgQueue; + +import com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgQueueTestsJspTest extends com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests { + static final String VEHICLE_ARCHIVE = "bytesMsgQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgQueue_appclient_vehicle: + bytesMsgQueue_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle: + bytesMsgQueue_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgQueue_jsp_vehicle: + bytesMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgQueue_servlet_vehicle: + bytesMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/bytesMsgQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive bytesMsgQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "bytesMsgQueue_jsp_vehicle_web.war"); + // The class files + bytesMsgQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = BytesMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + bytesMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + bytesMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + bytesMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(bytesMsgQueue_jsp_vehicle_web, BytesMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive bytesMsgQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgQueue_jsp_vehicle_ear.addAsModule(bytesMsgQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); + if(earResURL != null) { + bytesMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgQueue_jsp_vehicle_ear, BytesMsgQueueTests.class, earResURL); + return bytesMsgQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void bytesMsgNullStreamQTest() throws java.lang.Exception { + super.bytesMsgNullStreamQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bytesMessageQTestsFullMsg() throws java.lang.Exception { + super.bytesMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bytesMessageQNotWriteable() throws java.lang.Exception { + super.bytesMessageQNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java new file mode 100644 index 0000000000..1c366e0ec5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.bytesMsgQueue; + +import com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgQueueTestsServletTest extends com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests { + static final String VEHICLE_ARCHIVE = "bytesMsgQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgQueue_appclient_vehicle: + bytesMsgQueue_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle: + bytesMsgQueue_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgQueue_jsp_vehicle: + bytesMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgQueue_servlet_vehicle: + bytesMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/bytesMsgQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive bytesMsgQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "bytesMsgQueue_servlet_vehicle_web.war"); + // The class files + bytesMsgQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = BytesMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + bytesMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(bytesMsgQueue_servlet_vehicle_web, BytesMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive bytesMsgQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgQueue_servlet_vehicle_ear.addAsModule(bytesMsgQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); + if(earResURL != null) { + bytesMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgQueue_servlet_vehicle_ear, BytesMsgQueueTests.class, earResURL); + return bytesMsgQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void bytesMsgNullStreamQTest() throws java.lang.Exception { + super.bytesMsgNullStreamQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bytesMessageQTestsFullMsg() throws java.lang.Exception { + super.bytesMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bytesMessageQNotWriteable() throws java.lang.Exception { + super.bytesMessageQNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java new file mode 100644 index 0000000000..f95d4a719c --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java @@ -0,0 +1,139 @@ +package com.sun.ts.tests.jms.core.bytesMsgTopic; + +import com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests { + static final String VEHICLE_ARCHIVE = "bytesMsgTopic_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgTopic_appclient_vehicle: + bytesMsgTopic_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle: + bytesMsgTopic_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgTopic_jsp_vehicle: + bytesMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgTopic_servlet_vehicle: + bytesMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/bytesMsgTopic/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive bytesMsgTopic_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "bytesMsgTopic_appclient_vehicle_client.jar"); + // The class files + bytesMsgTopic_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + bytesMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = BytesMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + bytesMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + bytesMsgTopic_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + BytesMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(bytesMsgTopic_appclient_vehicle_client, BytesMsgTopicTests.class, resURL); + + // Ear + EnterpriseArchive bytesMsgTopic_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgTopic_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgTopic_appclient_vehicle_ear.addAsModule(bytesMsgTopic_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); + if(earResURL != null) { + bytesMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgTopic_appclient_vehicle_ear, BytesMsgTopicTests.class, earResURL); + return bytesMsgTopic_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void bytesMsgNullStreamTopicTest() throws java.lang.Exception { + super.bytesMsgNullStreamTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bytesMessageTopicTestsFullMsg() throws java.lang.Exception { + super.bytesMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bytesMessageTNotWriteable() throws java.lang.Exception { + super.bytesMessageTNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java new file mode 100644 index 0000000000..b1e304d9d5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java @@ -0,0 +1,175 @@ +package com.sun.ts.tests.jms.core.bytesMsgTopic; + +import com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgTopicTestsEjbTest extends com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests { + static final String VEHICLE_ARCHIVE = "bytesMsgTopic_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgTopic_appclient_vehicle: + bytesMsgTopic_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle: + bytesMsgTopic_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgTopic_jsp_vehicle: + bytesMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgTopic_servlet_vehicle: + bytesMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/bytesMsgTopic/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive bytesMsgTopic_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "bytesMsgTopic_ejb_vehicle_client.jar"); + // The class files + bytesMsgTopic_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + bytesMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = BytesMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + bytesMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + bytesMsgTopic_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + BytesMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(bytesMsgTopic_ejb_vehicle_client, BytesMsgTopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive bytesMsgTopic_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "bytesMsgTopic_ejb_vehicle_ejb.jar"); + // The class files + bytesMsgTopic_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = BytesMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + bytesMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = BytesMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + bytesMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(bytesMsgTopic_ejb_vehicle_ejb, BytesMsgTopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive bytesMsgTopic_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgTopic_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgTopic_ejb_vehicle_ear.addAsModule(bytesMsgTopic_ejb_vehicle_ejb); + bytesMsgTopic_ejb_vehicle_ear.addAsModule(bytesMsgTopic_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); + if(earResURL != null) { + bytesMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgTopic_ejb_vehicle_ear, BytesMsgTopicTests.class, earResURL); + return bytesMsgTopic_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void bytesMsgNullStreamTopicTest() throws java.lang.Exception { + super.bytesMsgNullStreamTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bytesMessageTopicTestsFullMsg() throws java.lang.Exception { + super.bytesMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bytesMessageTNotWriteable() throws java.lang.Exception { + super.bytesMessageTNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java new file mode 100644 index 0000000000..02635ced2d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java @@ -0,0 +1,158 @@ +package com.sun.ts.tests.jms.core.bytesMsgTopic; + +import com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgTopicTestsJspTest extends com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests { + static final String VEHICLE_ARCHIVE = "bytesMsgTopic_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgTopic_appclient_vehicle: + bytesMsgTopic_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle: + bytesMsgTopic_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgTopic_jsp_vehicle: + bytesMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgTopic_servlet_vehicle: + bytesMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/bytesMsgTopic/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive bytesMsgTopic_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "bytesMsgTopic_jsp_vehicle_web.war"); + // The class files + bytesMsgTopic_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = BytesMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + bytesMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/jsp_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + bytesMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + bytesMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(bytesMsgTopic_jsp_vehicle_web, BytesMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive bytesMsgTopic_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgTopic_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgTopic_jsp_vehicle_ear.addAsModule(bytesMsgTopic_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); + if(earResURL != null) { + bytesMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgTopic_jsp_vehicle_ear, BytesMsgTopicTests.class, earResURL); + return bytesMsgTopic_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void bytesMsgNullStreamTopicTest() throws java.lang.Exception { + super.bytesMsgNullStreamTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bytesMessageTopicTestsFullMsg() throws java.lang.Exception { + super.bytesMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bytesMessageTNotWriteable() throws java.lang.Exception { + super.bytesMessageTNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java new file mode 100644 index 0000000000..ddf9812f9e --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.bytesMsgTopic; + +import com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class BytesMsgTopicTestsServletTest extends com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests { + static final String VEHICLE_ARCHIVE = "bytesMsgTopic_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + bytesMsgTopic_appclient_vehicle: + bytesMsgTopic_appclient_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle: + bytesMsgTopic_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + bytesMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + bytesMsgTopic_jsp_vehicle: + bytesMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + bytesMsgTopic_servlet_vehicle: + bytesMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/bytesMsgTopic/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive bytesMsgTopic_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "bytesMsgTopic_servlet_vehicle_web.war"); + // The class files + bytesMsgTopic_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = BytesMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + bytesMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/servlet_vehicle_web.xml"); + if(warResURL != null) { + bytesMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(bytesMsgTopic_servlet_vehicle_web, BytesMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive bytesMsgTopic_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "bytesMsgTopic_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + bytesMsgTopic_servlet_vehicle_ear.addAsModule(bytesMsgTopic_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); + if(earResURL != null) { + bytesMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + bytesMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(bytesMsgTopic_servlet_vehicle_ear, BytesMsgTopicTests.class, earResURL); + return bytesMsgTopic_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void bytesMsgNullStreamTopicTest() throws java.lang.Exception { + super.bytesMsgNullStreamTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bytesMessageTopicTestsFullMsg() throws java.lang.Exception { + super.bytesMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bytesMessageTNotWriteable() throws java.lang.Exception { + super.bytesMessageTNotWriteable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java new file mode 100644 index 0000000000..f96c875399 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java @@ -0,0 +1,448 @@ +package com.sun.ts.tests.jms.core.closedQueueConnection; + +import com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueConnectionTestsAppclientTest extends com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests { + static final String VEHICLE_ARCHIVE = "closedQueueConnection_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueConnection_appclient_vehicle: + closedQueueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle: + closedQueueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueConnection_jsp_vehicle: + closedQueueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueConnection_servlet_vehicle: + closedQueueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedQueueConnection/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueConnection_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueConnection_appclient_vehicle_client.jar"); + // The class files + closedQueueConnection_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueConnection_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueConnection_appclient_vehicle_client, ClosedQueueConnectionTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueConnection_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueConnection_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueConnection_appclient_vehicle_ear.addAsModule(closedQueueConnection_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); + if(earResURL != null) { + closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueConnection_appclient_vehicle_ear, ClosedQueueConnectionTests.class, earResURL); + return closedQueueConnection_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCommitTest() throws java.lang.Exception { + super.closedQueueConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetTransactedTest() throws java.lang.Exception { + super.closedQueueConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionRollbackTest() throws java.lang.Exception { + super.closedQueueConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionRecoverTest() throws java.lang.Exception { + super.closedQueueConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetClientIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedQueueConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionStartTest() throws java.lang.Exception { + super.closedQueueConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateQueueSessionTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueSessionTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSessionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateSenderTest() throws java.lang.Exception { + super.closedQueueConnectionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionReceiveTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSenderCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSend1Test() throws java.lang.Exception { + super.closedQueueConnectionSend1Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSend2Test() throws java.lang.Exception { + super.closedQueueConnectionSend2Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSend3Test() throws java.lang.Exception { + super.closedQueueConnectionSend3Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueConnectionSend4Test() throws java.lang.Exception { + super.closedQueueConnectionSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java new file mode 100644 index 0000000000..60100250b5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java @@ -0,0 +1,486 @@ +package com.sun.ts.tests.jms.core.closedQueueConnection; + +import com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueConnectionTestsEjbTest extends com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests { + static final String VEHICLE_ARCHIVE = "closedQueueConnection_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueConnection_appclient_vehicle: + closedQueueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle: + closedQueueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueConnection_jsp_vehicle: + closedQueueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueConnection_servlet_vehicle: + closedQueueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedQueueConnection/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueConnection_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueConnection_ejb_vehicle_client.jar"); + // The class files + closedQueueConnection_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedQueueConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueConnection_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueConnection_ejb_vehicle_client, ClosedQueueConnectionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedQueueConnection_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedQueueConnection_ejb_vehicle_ejb.jar"); + // The class files + closedQueueConnection_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedQueueConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedQueueConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedQueueConnection_ejb_vehicle_ejb, ClosedQueueConnectionTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedQueueConnection_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueConnection_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueConnection_ejb_vehicle_ear.addAsModule(closedQueueConnection_ejb_vehicle_ejb); + closedQueueConnection_ejb_vehicle_ear.addAsModule(closedQueueConnection_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); + if(earResURL != null) { + closedQueueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueConnection_ejb_vehicle_ear, ClosedQueueConnectionTests.class, earResURL); + return closedQueueConnection_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCommitTest() throws java.lang.Exception { + super.closedQueueConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetTransactedTest() throws java.lang.Exception { + super.closedQueueConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionRollbackTest() throws java.lang.Exception { + super.closedQueueConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionRecoverTest() throws java.lang.Exception { + super.closedQueueConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetClientIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedQueueConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionStartTest() throws java.lang.Exception { + super.closedQueueConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateQueueSessionTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueSessionTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSessionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateSenderTest() throws java.lang.Exception { + super.closedQueueConnectionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionReceiveTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSenderCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSend1Test() throws java.lang.Exception { + super.closedQueueConnectionSend1Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSend2Test() throws java.lang.Exception { + super.closedQueueConnectionSend2Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSend3Test() throws java.lang.Exception { + super.closedQueueConnectionSend3Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueConnectionSend4Test() throws java.lang.Exception { + super.closedQueueConnectionSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java new file mode 100644 index 0000000000..b88ad2aed0 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java @@ -0,0 +1,468 @@ +package com.sun.ts.tests.jms.core.closedQueueConnection; + +import com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueConnectionTestsJspTest extends com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests { + static final String VEHICLE_ARCHIVE = "closedQueueConnection_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueConnection_appclient_vehicle: + closedQueueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle: + closedQueueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueConnection_jsp_vehicle: + closedQueueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueConnection_servlet_vehicle: + closedQueueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueConnection/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueConnection_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueConnection_jsp_vehicle_web.war"); + // The class files + closedQueueConnection_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedQueueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedQueueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueConnection_jsp_vehicle_web, ClosedQueueConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueConnection_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueConnection_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueConnection_jsp_vehicle_ear.addAsModule(closedQueueConnection_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); + if(earResURL != null) { + closedQueueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueConnection_jsp_vehicle_ear, ClosedQueueConnectionTests.class, earResURL); + return closedQueueConnection_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCommitTest() throws java.lang.Exception { + super.closedQueueConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetTransactedTest() throws java.lang.Exception { + super.closedQueueConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionRollbackTest() throws java.lang.Exception { + super.closedQueueConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionRecoverTest() throws java.lang.Exception { + super.closedQueueConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetClientIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedQueueConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionStartTest() throws java.lang.Exception { + super.closedQueueConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateQueueSessionTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueSessionTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSessionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateSenderTest() throws java.lang.Exception { + super.closedQueueConnectionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionReceiveTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSenderCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSend1Test() throws java.lang.Exception { + super.closedQueueConnectionSend1Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSend2Test() throws java.lang.Exception { + super.closedQueueConnectionSend2Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSend3Test() throws java.lang.Exception { + super.closedQueueConnectionSend3Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueConnectionSend4Test() throws java.lang.Exception { + super.closedQueueConnectionSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java new file mode 100644 index 0000000000..ad7f87e270 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java @@ -0,0 +1,461 @@ +package com.sun.ts.tests.jms.core.closedQueueConnection; + +import com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueConnectionTestsServletTest extends com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests { + static final String VEHICLE_ARCHIVE = "closedQueueConnection_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueConnection_appclient_vehicle: + closedQueueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle: + closedQueueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueConnection_jsp_vehicle: + closedQueueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueConnection_servlet_vehicle: + closedQueueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueConnection/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueConnection_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueConnection_servlet_vehicle_web.war"); + // The class files + closedQueueConnection_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueConnection_servlet_vehicle_web, ClosedQueueConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueConnection_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueConnection_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueConnection_servlet_vehicle_ear.addAsModule(closedQueueConnection_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); + if(earResURL != null) { + closedQueueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueConnection_servlet_vehicle_ear, ClosedQueueConnectionTests.class, earResURL); + return closedQueueConnection_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCommitTest() throws java.lang.Exception { + super.closedQueueConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetTransactedTest() throws java.lang.Exception { + super.closedQueueConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionRollbackTest() throws java.lang.Exception { + super.closedQueueConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionRecoverTest() throws java.lang.Exception { + super.closedQueueConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetClientIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedQueueConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionStartTest() throws java.lang.Exception { + super.closedQueueConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateQueueSessionTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueSessionTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSessionCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateSenderTest() throws java.lang.Exception { + super.closedQueueConnectionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionReceiveTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSenderCloseTest() throws java.lang.Exception { + super.closedQueueConnectionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSetPriorityTest() throws java.lang.Exception { + super.closedQueueConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueConnectionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSend1Test() throws java.lang.Exception { + super.closedQueueConnectionSend1Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSend2Test() throws java.lang.Exception { + super.closedQueueConnectionSend2Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSend3Test() throws java.lang.Exception { + super.closedQueueConnectionSend3Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueConnectionSend4Test() throws java.lang.Exception { + super.closedQueueConnectionSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java new file mode 100644 index 0000000000..8763aa3abb --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java @@ -0,0 +1,160 @@ +package com.sun.ts.tests.jms.core.closedQueueReceiver; + +import com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueReceiverTestsAppclientTest extends com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests { + static final String VEHICLE_ARCHIVE = "closedQueueReceiver_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueReceiver_appclient_vehicle: + closedQueueReceiver_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle: + closedQueueReceiver_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueReceiver_jsp_vehicle: + closedQueueReceiver_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueReceiver_servlet_vehicle: + closedQueueReceiver_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedQueueReceiver/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueReceiver_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueReceiver_appclient_vehicle_client.jar"); + // The class files + closedQueueReceiver_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueReceiver_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueReceiver_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueReceiver_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueReceiverTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueReceiver_appclient_vehicle_client, ClosedQueueReceiverTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueReceiver_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueReceiver_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueReceiver_appclient_vehicle_ear.addAsModule(closedQueueReceiver_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); + if(earResURL != null) { + closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueReceiver_appclient_vehicle_ear, ClosedQueueReceiverTests.class, earResURL); + return closedQueueReceiver_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverCloseTest() throws java.lang.Exception { + super.closedQueueReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueReceiverGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverReceiveTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueReceiverGetQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java new file mode 100644 index 0000000000..384e495c08 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java @@ -0,0 +1,196 @@ +package com.sun.ts.tests.jms.core.closedQueueReceiver; + +import com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueReceiverTestsEjbTest extends com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests { + static final String VEHICLE_ARCHIVE = "closedQueueReceiver_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueReceiver_appclient_vehicle: + closedQueueReceiver_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle: + closedQueueReceiver_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueReceiver_jsp_vehicle: + closedQueueReceiver_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueReceiver_servlet_vehicle: + closedQueueReceiver_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedQueueReceiver/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueReceiver_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueReceiver_ejb_vehicle_client.jar"); + // The class files + closedQueueReceiver_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedQueueReceiver_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueReceiver_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueReceiver_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueReceiverTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueReceiver_ejb_vehicle_client, ClosedQueueReceiverTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedQueueReceiver_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedQueueReceiver_ejb_vehicle_ejb.jar"); + // The class files + closedQueueReceiver_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedQueueReceiver_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedQueueReceiver_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedQueueReceiver_ejb_vehicle_ejb, ClosedQueueReceiverTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedQueueReceiver_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueReceiver_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueReceiver_ejb_vehicle_ear.addAsModule(closedQueueReceiver_ejb_vehicle_ejb); + closedQueueReceiver_ejb_vehicle_ear.addAsModule(closedQueueReceiver_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); + if(earResURL != null) { + closedQueueReceiver_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueReceiver_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueReceiver_ejb_vehicle_ear, ClosedQueueReceiverTests.class, earResURL); + return closedQueueReceiver_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueReceiverCloseTest() throws java.lang.Exception { + super.closedQueueReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueReceiverGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueReceiverGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueReceiverReceiveTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueReceiverReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueReceiverReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueReceiverGetQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java new file mode 100644 index 0000000000..a433397dd7 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java @@ -0,0 +1,179 @@ +package com.sun.ts.tests.jms.core.closedQueueReceiver; + +import com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueReceiverTestsJspTest extends com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests { + static final String VEHICLE_ARCHIVE = "closedQueueReceiver_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueReceiver_appclient_vehicle: + closedQueueReceiver_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle: + closedQueueReceiver_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueReceiver_jsp_vehicle: + closedQueueReceiver_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueReceiver_servlet_vehicle: + closedQueueReceiver_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueReceiver/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueReceiver_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueReceiver_jsp_vehicle_web.war"); + // The class files + closedQueueReceiver_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueReceiver_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueReceiver_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueReceiver_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueReceiver_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedQueueReceiver_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedQueueReceiver_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueReceiver_jsp_vehicle_web, ClosedQueueReceiverTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueReceiver_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueReceiver_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueReceiver_jsp_vehicle_ear.addAsModule(closedQueueReceiver_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); + if(earResURL != null) { + closedQueueReceiver_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueReceiver_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueReceiver_jsp_vehicle_ear, ClosedQueueReceiverTests.class, earResURL); + return closedQueueReceiver_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueReceiverCloseTest() throws java.lang.Exception { + super.closedQueueReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueReceiverGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueReceiverGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueReceiverReceiveTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueReceiverReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueReceiverReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueReceiverGetQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java new file mode 100644 index 0000000000..db0dda1732 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java @@ -0,0 +1,172 @@ +package com.sun.ts.tests.jms.core.closedQueueReceiver; + +import com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueReceiverTestsServletTest extends com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests { + static final String VEHICLE_ARCHIVE = "closedQueueReceiver_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueReceiver_appclient_vehicle: + closedQueueReceiver_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle: + closedQueueReceiver_ejb_vehicle_client: jar.sun-application-client.xml,META-INF/application-client.xml + closedQueueReceiver_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueReceiver_jsp_vehicle: + closedQueueReceiver_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueReceiver_servlet_vehicle: + closedQueueReceiver_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueReceiver/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueReceiver_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueReceiver_servlet_vehicle_web.war"); + // The class files + closedQueueReceiver_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueReceiver_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueReceiverTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueReceiver_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueReceiver_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueReceiver_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueReceiver_servlet_vehicle_web, ClosedQueueReceiverTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueReceiver_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueReceiver_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueReceiver_servlet_vehicle_ear.addAsModule(closedQueueReceiver_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); + if(earResURL != null) { + closedQueueReceiver_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueReceiver_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueReceiver_servlet_vehicle_ear, ClosedQueueReceiverTests.class, earResURL); + return closedQueueReceiver_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueReceiverCloseTest() throws java.lang.Exception { + super.closedQueueReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueReceiverGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueReceiverGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueReceiverReceiveTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueReceiverReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueReceiverReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueReceiverReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueReceiverGetQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java new file mode 100644 index 0000000000..f50322c4d8 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java @@ -0,0 +1,231 @@ +package com.sun.ts.tests.jms.core.closedQueueSender; + +import com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSenderTestsAppclientTest extends com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests { + static final String VEHICLE_ARCHIVE = "closedQueueSender_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSender_appclient_vehicle: + closedQueueSender_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle: + closedQueueSender_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSender_jsp_vehicle: + closedQueueSender_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSender_servlet_vehicle: + closedQueueSender_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedQueueSender/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueSender_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueSender_appclient_vehicle_client.jar"); + // The class files + closedQueueSender_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueSender_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueSenderTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueSender_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueSender_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueSenderTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueSender_appclient_vehicle_client, ClosedQueueSenderTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueSender_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSender_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSender_appclient_vehicle_ear.addAsModule(closedQueueSender_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); + if(earResURL != null) { + closedQueueSender_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSender_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSender_appclient_vehicle_ear, ClosedQueueSenderTests.class, earResURL); + return closedQueueSender_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderCloseTest() throws java.lang.Exception { + super.closedQueueSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderGetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSend1Test() throws java.lang.Exception { + super.closedQueueSenderSend1Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSend2Test() throws java.lang.Exception { + super.closedQueueSenderSend2Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSend3Test() throws java.lang.Exception { + super.closedQueueSenderSend3Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSenderSend4Test() throws java.lang.Exception { + super.closedQueueSenderSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java new file mode 100644 index 0000000000..15574718f0 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java @@ -0,0 +1,269 @@ +package com.sun.ts.tests.jms.core.closedQueueSender; + +import com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSenderTestsEjbTest extends com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests { + static final String VEHICLE_ARCHIVE = "closedQueueSender_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSender_appclient_vehicle: + closedQueueSender_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle: + closedQueueSender_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSender_jsp_vehicle: + closedQueueSender_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSender_servlet_vehicle: + closedQueueSender_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedQueueSender/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueSender_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueSender_ejb_vehicle_client.jar"); + // The class files + closedQueueSender_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedQueueSender_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueSenderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueSender_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueSender_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueSenderTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueSender_ejb_vehicle_client, ClosedQueueSenderTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedQueueSender_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedQueueSender_ejb_vehicle_ejb.jar"); + // The class files + closedQueueSender_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedQueueSenderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedQueueSender_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedQueueSenderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedQueueSender_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedQueueSender_ejb_vehicle_ejb, ClosedQueueSenderTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedQueueSender_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSender_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSender_ejb_vehicle_ear.addAsModule(closedQueueSender_ejb_vehicle_ejb); + closedQueueSender_ejb_vehicle_ear.addAsModule(closedQueueSender_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); + if(earResURL != null) { + closedQueueSender_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSender_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSender_ejb_vehicle_ear, ClosedQueueSenderTests.class, earResURL); + return closedQueueSender_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderCloseTest() throws java.lang.Exception { + super.closedQueueSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderGetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSend1Test() throws java.lang.Exception { + super.closedQueueSenderSend1Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSend2Test() throws java.lang.Exception { + super.closedQueueSenderSend2Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSend3Test() throws java.lang.Exception { + super.closedQueueSenderSend3Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSenderSend4Test() throws java.lang.Exception { + super.closedQueueSenderSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java new file mode 100644 index 0000000000..64c9115313 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java @@ -0,0 +1,251 @@ +package com.sun.ts.tests.jms.core.closedQueueSender; + +import com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSenderTestsJspTest extends com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests { + static final String VEHICLE_ARCHIVE = "closedQueueSender_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSender_appclient_vehicle: + closedQueueSender_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle: + closedQueueSender_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSender_jsp_vehicle: + closedQueueSender_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSender_servlet_vehicle: + closedQueueSender_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueSender/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueSender_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueSender_jsp_vehicle_web.war"); + // The class files + closedQueueSender_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSender_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueSenderTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueSender_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSender_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSender_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedQueueSender_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedQueueSender_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueSender_jsp_vehicle_web, ClosedQueueSenderTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueSender_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSender_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSender_jsp_vehicle_ear.addAsModule(closedQueueSender_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); + if(earResURL != null) { + closedQueueSender_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSender_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSender_jsp_vehicle_ear, ClosedQueueSenderTests.class, earResURL); + return closedQueueSender_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderCloseTest() throws java.lang.Exception { + super.closedQueueSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderGetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSend1Test() throws java.lang.Exception { + super.closedQueueSenderSend1Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSend2Test() throws java.lang.Exception { + super.closedQueueSenderSend2Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSend3Test() throws java.lang.Exception { + super.closedQueueSenderSend3Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSenderSend4Test() throws java.lang.Exception { + super.closedQueueSenderSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java new file mode 100644 index 0000000000..30ebccb00b --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java @@ -0,0 +1,244 @@ +package com.sun.ts.tests.jms.core.closedQueueSender; + +import com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSenderTestsServletTest extends com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests { + static final String VEHICLE_ARCHIVE = "closedQueueSender_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSender_appclient_vehicle: + closedQueueSender_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle: + closedQueueSender_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSender_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSender_jsp_vehicle: + closedQueueSender_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSender_servlet_vehicle: + closedQueueSender_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueSender/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueSender_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueSender_servlet_vehicle_web.war"); + // The class files + closedQueueSender_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSender_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueSenderTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueSender_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSender_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSender_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueSender_servlet_vehicle_web, ClosedQueueSenderTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueSender_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSender_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSender_servlet_vehicle_ear.addAsModule(closedQueueSender_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); + if(earResURL != null) { + closedQueueSender_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSender_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSender_servlet_vehicle_ear, ClosedQueueSenderTests.class, earResURL); + return closedQueueSender_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderCloseTest() throws java.lang.Exception { + super.closedQueueSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderGetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSenderSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSenderSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSetPriorityTest() throws java.lang.Exception { + super.closedQueueSenderSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSenderSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSend1Test() throws java.lang.Exception { + super.closedQueueSenderSend1Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSend2Test() throws java.lang.Exception { + super.closedQueueSenderSend2Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSend3Test() throws java.lang.Exception { + super.closedQueueSenderSend3Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSenderSend4Test() throws java.lang.Exception { + super.closedQueueSenderSend4Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java new file mode 100644 index 0000000000..bb658beb0b --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java @@ -0,0 +1,425 @@ +package com.sun.ts.tests.jms.core.closedQueueSession; + +import com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSessionTestsAppclientTest extends com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests { + static final String VEHICLE_ARCHIVE = "closedQueueSession_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSession_appclient_vehicle: + closedQueueSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle: + closedQueueSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSession_jsp_vehicle: + closedQueueSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSession_servlet_vehicle: + closedQueueSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedQueueSession/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueSession_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueSession_appclient_vehicle_client.jar"); + // The class files + closedQueueSession_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedQueueSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueSession_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueSessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueSession_appclient_vehicle_client, ClosedQueueSessionTests.class, resURL); + + // Ear + EnterpriseArchive closedQueueSession_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSession_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSession_appclient_vehicle_ear.addAsModule(closedQueueSession_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); + if(earResURL != null) { + closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSession_appclient_vehicle_ear, ClosedQueueSessionTests.class, earResURL); + return closedQueueSession_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCloseTest() throws java.lang.Exception { + super.closedQueueSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateSenderTest() throws java.lang.Exception { + super.closedQueueSessionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueSessionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionReceiveTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSenderCloseTest() throws java.lang.Exception { + super.closedQueueSessionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSend1Test() throws java.lang.Exception { + super.closedQueueSessionSend1Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSend2Test() throws java.lang.Exception { + super.closedQueueSessionSend2Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSend3Test() throws java.lang.Exception { + super.closedQueueSessionSend3Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionSend4Test() throws java.lang.Exception { + super.closedQueueSessionSend4Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionRecoverTest() throws java.lang.Exception { + super.closedQueueSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedSessionRecoverTest() throws java.lang.Exception { + super.closedSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionCommitTest() throws java.lang.Exception { + super.closedQueueSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionGetTransactedTest() throws java.lang.Exception { + super.closedQueueSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedQueueSessionRollbackTest() throws java.lang.Exception { + super.closedQueueSessionRollbackTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java new file mode 100644 index 0000000000..1ca1c98a40 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java @@ -0,0 +1,473 @@ +package com.sun.ts.tests.jms.core.closedQueueSession; + +import com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSessionTestsEjbTest extends com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests { + static final String VEHICLE_ARCHIVE = "closedQueueSession_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSession_appclient_vehicle: + closedQueueSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle: + closedQueueSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSession_jsp_vehicle: + closedQueueSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSession_servlet_vehicle: + closedQueueSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedQueueSession/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedQueueSession_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedQueueSession_ejb_vehicle_client.jar"); + // The class files + closedQueueSession_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedQueueSession_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedQueueSession_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedQueueSession_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedQueueSessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedQueueSession_ejb_vehicle_client, ClosedQueueSessionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedQueueSession_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedQueueSession_ejb_vehicle_ejb.jar"); + // The class files + closedQueueSession_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedQueueSession_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedQueueSession_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedQueueSession_ejb_vehicle_ejb, ClosedQueueSessionTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedQueueSession_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSession_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSession_ejb_vehicle_ear.addAsModule(closedQueueSession_ejb_vehicle_ejb); + closedQueueSession_ejb_vehicle_ear.addAsModule(closedQueueSession_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); + if(earResURL != null) { + closedQueueSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSession_ejb_vehicle_ear, ClosedQueueSessionTests.class, earResURL); + return closedQueueSession_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCloseTest() throws java.lang.Exception { + super.closedQueueSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateSenderTest() throws java.lang.Exception { + super.closedQueueSessionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueSessionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionReceiveTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSenderCloseTest() throws java.lang.Exception { + super.closedQueueSessionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSend1Test() throws java.lang.Exception { + super.closedQueueSessionSend1Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSend2Test() throws java.lang.Exception { + super.closedQueueSessionSend2Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSend3Test() throws java.lang.Exception { + super.closedQueueSessionSend3Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionSend4Test() throws java.lang.Exception { + super.closedQueueSessionSend4Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionRecoverTest() throws java.lang.Exception { + super.closedQueueSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedSessionRecoverTest() throws java.lang.Exception { + super.closedSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionCommitTest() throws java.lang.Exception { + super.closedQueueSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionGetTransactedTest() throws java.lang.Exception { + super.closedQueueSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedQueueSessionRollbackTest() throws java.lang.Exception { + super.closedQueueSessionRollbackTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java new file mode 100644 index 0000000000..350e6d3c10 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java @@ -0,0 +1,450 @@ +package com.sun.ts.tests.jms.core.closedQueueSession; + +import com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSessionTestsJspTest extends com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests { + static final String VEHICLE_ARCHIVE = "closedQueueSession_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSession_appclient_vehicle: + closedQueueSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle: + closedQueueSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSession_jsp_vehicle: + closedQueueSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSession_servlet_vehicle: + closedQueueSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueSession/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueSession_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueSession_jsp_vehicle_web.war"); + // The class files + closedQueueSession_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSession_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueSession_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSession_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSession_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedQueueSession_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedQueueSession_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueSession_jsp_vehicle_web, ClosedQueueSessionTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueSession_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSession_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSession_jsp_vehicle_ear.addAsModule(closedQueueSession_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); + if(earResURL != null) { + closedQueueSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSession_jsp_vehicle_ear, ClosedQueueSessionTests.class, earResURL); + return closedQueueSession_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCloseTest() throws java.lang.Exception { + super.closedQueueSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateSenderTest() throws java.lang.Exception { + super.closedQueueSessionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueSessionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionReceiveTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSenderCloseTest() throws java.lang.Exception { + super.closedQueueSessionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSend1Test() throws java.lang.Exception { + super.closedQueueSessionSend1Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSend2Test() throws java.lang.Exception { + super.closedQueueSessionSend2Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSend3Test() throws java.lang.Exception { + super.closedQueueSessionSend3Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionSend4Test() throws java.lang.Exception { + super.closedQueueSessionSend4Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionRecoverTest() throws java.lang.Exception { + super.closedQueueSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedSessionRecoverTest() throws java.lang.Exception { + super.closedSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionCommitTest() throws java.lang.Exception { + super.closedQueueSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionGetTransactedTest() throws java.lang.Exception { + super.closedQueueSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedQueueSessionRollbackTest() throws java.lang.Exception { + super.closedQueueSessionRollbackTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java new file mode 100644 index 0000000000..fb80c36cd0 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java @@ -0,0 +1,443 @@ +package com.sun.ts.tests.jms.core.closedQueueSession; + +import com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedQueueSessionTestsServletTest extends com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests { + static final String VEHICLE_ARCHIVE = "closedQueueSession_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedQueueSession_appclient_vehicle: + closedQueueSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle: + closedQueueSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedQueueSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedQueueSession_jsp_vehicle: + closedQueueSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedQueueSession_servlet_vehicle: + closedQueueSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedQueueSession/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedQueueSession_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedQueueSession_servlet_vehicle_web.war"); + // The class files + closedQueueSession_servlet_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSession_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedQueueSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedQueueSession_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSession_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedQueueSession_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedQueueSession_servlet_vehicle_web, ClosedQueueSessionTests.class, warResURL); + + // Ear + EnterpriseArchive closedQueueSession_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedQueueSession_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedQueueSession_servlet_vehicle_ear.addAsModule(closedQueueSession_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); + if(earResURL != null) { + closedQueueSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedQueueSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedQueueSession_servlet_vehicle_ear, ClosedQueueSessionTests.class, earResURL); + return closedQueueSession_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCloseTest() throws java.lang.Exception { + super.closedQueueSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateBrowserTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateBrowserMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateBrowserMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateReceiverTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateReceiverMsgSelectorTest() throws java.lang.Exception { + super.closedQueueSessionCreateReceiverMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateSenderTest() throws java.lang.Exception { + super.closedQueueSessionCreateSenderTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateTempQueueTest() throws java.lang.Exception { + super.closedQueueSessionCreateTempQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedQueueSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionReceiverCloseTest() throws java.lang.Exception { + super.closedQueueSessionReceiverCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedQueueSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionReceiveTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedQueueSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedQueueSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionReceiverGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionReceiverGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSenderCloseTest() throws java.lang.Exception { + super.closedQueueSessionSenderCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedQueueSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedQueueSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSetPriorityTest() throws java.lang.Exception { + super.closedQueueSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedQueueSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSenderGetQueueTest() throws java.lang.Exception { + super.closedQueueSessionSenderGetQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSend1Test() throws java.lang.Exception { + super.closedQueueSessionSend1Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSend2Test() throws java.lang.Exception { + super.closedQueueSessionSend2Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSend3Test() throws java.lang.Exception { + super.closedQueueSessionSend3Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionSend4Test() throws java.lang.Exception { + super.closedQueueSessionSend4Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionRecoverTest() throws java.lang.Exception { + super.closedQueueSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedSessionRecoverTest() throws java.lang.Exception { + super.closedSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionCommitTest() throws java.lang.Exception { + super.closedQueueSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionGetTransactedTest() throws java.lang.Exception { + super.closedQueueSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedQueueSessionRollbackTest() throws java.lang.Exception { + super.closedQueueSessionRollbackTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java new file mode 100644 index 0000000000..29ac35b52a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java @@ -0,0 +1,427 @@ +package com.sun.ts.tests.jms.core.closedTopicConnection; + +import com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicConnectionTestsAppclientTest extends com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests { + static final String VEHICLE_ARCHIVE = "closedTopicConnection_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicConnection_appclient_vehicle: + closedTopicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle: + closedTopicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicConnection_jsp_vehicle: + closedTopicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicConnection_servlet_vehicle: + closedTopicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedTopicConnection/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicConnection_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicConnection_appclient_vehicle_client.jar"); + // The class files + closedTopicConnection_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedTopicConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicConnection_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicConnection_appclient_vehicle_client, ClosedTopicConnectionTests.class, resURL); + + // Ear + EnterpriseArchive closedTopicConnection_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicConnection_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicConnection_appclient_vehicle_ear.addAsModule(closedTopicConnection_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); + if(earResURL != null) { + closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicConnection_appclient_vehicle_ear, ClosedTopicConnectionTests.class, earResURL); + return closedTopicConnection_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCommitTest() throws java.lang.Exception { + super.closedTopicConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionRollbackTest() throws java.lang.Exception { + super.closedTopicConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionRecoverTest() throws java.lang.Exception { + super.closedTopicConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetClientIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedTopicConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionStartTest() throws java.lang.Exception { + super.closedTopicConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateTopicSessionTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicSessionTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSessionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicConnectionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetTransactedTest() throws java.lang.Exception { + super.closedTopicConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionReceiveTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicConnectionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionPublish1Test() throws java.lang.Exception { + super.closedTopicConnectionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicConnectionPublish2Test() throws java.lang.Exception { + super.closedTopicConnectionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java new file mode 100644 index 0000000000..c35b72ef07 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java @@ -0,0 +1,465 @@ +package com.sun.ts.tests.jms.core.closedTopicConnection; + +import com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicConnectionTestsEjbTest extends com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests { + static final String VEHICLE_ARCHIVE = "closedTopicConnection_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicConnection_appclient_vehicle: + closedTopicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle: + closedTopicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicConnection_jsp_vehicle: + closedTopicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicConnection_servlet_vehicle: + closedTopicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedTopicConnection/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicConnection_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicConnection_ejb_vehicle_client.jar"); + // The class files + closedTopicConnection_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedTopicConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicConnection_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicConnection_ejb_vehicle_client, ClosedTopicConnectionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedTopicConnection_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedTopicConnection_ejb_vehicle_ejb.jar"); + // The class files + closedTopicConnection_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedTopicConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedTopicConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedTopicConnection_ejb_vehicle_ejb, ClosedTopicConnectionTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedTopicConnection_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicConnection_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicConnection_ejb_vehicle_ear.addAsModule(closedTopicConnection_ejb_vehicle_ejb); + closedTopicConnection_ejb_vehicle_ear.addAsModule(closedTopicConnection_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); + if(earResURL != null) { + closedTopicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicConnection_ejb_vehicle_ear, ClosedTopicConnectionTests.class, earResURL); + return closedTopicConnection_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCommitTest() throws java.lang.Exception { + super.closedTopicConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionRollbackTest() throws java.lang.Exception { + super.closedTopicConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionRecoverTest() throws java.lang.Exception { + super.closedTopicConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetClientIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedTopicConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionStartTest() throws java.lang.Exception { + super.closedTopicConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateTopicSessionTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicSessionTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSessionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicConnectionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetTransactedTest() throws java.lang.Exception { + super.closedTopicConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionReceiveTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicConnectionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionPublish1Test() throws java.lang.Exception { + super.closedTopicConnectionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicConnectionPublish2Test() throws java.lang.Exception { + super.closedTopicConnectionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java new file mode 100644 index 0000000000..32eeac348e --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java @@ -0,0 +1,447 @@ +package com.sun.ts.tests.jms.core.closedTopicConnection; + +import com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicConnectionTestsJspTest extends com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests { + static final String VEHICLE_ARCHIVE = "closedTopicConnection_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicConnection_appclient_vehicle: + closedTopicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle: + closedTopicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicConnection_jsp_vehicle: + closedTopicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicConnection_servlet_vehicle: + closedTopicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicConnection/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicConnection_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicConnection_jsp_vehicle_web.war"); + // The class files + closedTopicConnection_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedTopicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedTopicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicConnection_jsp_vehicle_web, ClosedTopicConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicConnection_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicConnection_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicConnection_jsp_vehicle_ear.addAsModule(closedTopicConnection_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); + if(earResURL != null) { + closedTopicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicConnection_jsp_vehicle_ear, ClosedTopicConnectionTests.class, earResURL); + return closedTopicConnection_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCommitTest() throws java.lang.Exception { + super.closedTopicConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionRollbackTest() throws java.lang.Exception { + super.closedTopicConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionRecoverTest() throws java.lang.Exception { + super.closedTopicConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetClientIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedTopicConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionStartTest() throws java.lang.Exception { + super.closedTopicConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateTopicSessionTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicSessionTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSessionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicConnectionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetTransactedTest() throws java.lang.Exception { + super.closedTopicConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionReceiveTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicConnectionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionPublish1Test() throws java.lang.Exception { + super.closedTopicConnectionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicConnectionPublish2Test() throws java.lang.Exception { + super.closedTopicConnectionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java new file mode 100644 index 0000000000..1a764da539 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java @@ -0,0 +1,440 @@ +package com.sun.ts.tests.jms.core.closedTopicConnection; + +import com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicConnectionTestsServletTest extends com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests { + static final String VEHICLE_ARCHIVE = "closedTopicConnection_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicConnection_appclient_vehicle: + closedTopicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle: + closedTopicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicConnection_jsp_vehicle: + closedTopicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicConnection_servlet_vehicle: + closedTopicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicConnection/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicConnection_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicConnection_servlet_vehicle_web.war"); + // The class files + closedTopicConnection_servlet_vehicle_web.addClasses( + com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests.class, + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicConnection_servlet_vehicle_web, ClosedTopicConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicConnection_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicConnection_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicConnection_servlet_vehicle_ear.addAsModule(closedTopicConnection_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); + if(earResURL != null) { + closedTopicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicConnection_servlet_vehicle_ear, ClosedTopicConnectionTests.class, earResURL); + return closedTopicConnection_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCommitTest() throws java.lang.Exception { + super.closedTopicConnectionCommitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionRollbackTest() throws java.lang.Exception { + super.closedTopicConnectionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionRecoverTest() throws java.lang.Exception { + super.closedTopicConnectionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetClientIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetMetaDataTest() throws java.lang.Exception { + super.closedTopicConnectionGetMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionStartTest() throws java.lang.Exception { + super.closedTopicConnectionStartTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateTopicSessionTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicSessionTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSessionCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicConnectionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicConnectionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetTransactedTest() throws java.lang.Exception { + super.closedTopicConnectionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicConnectionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionReceiveTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicConnectionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicConnectionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicConnectionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicConnectionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSetPriorityTest() throws java.lang.Exception { + super.closedTopicConnectionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicConnectionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicConnectionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionPublish1Test() throws java.lang.Exception { + super.closedTopicConnectionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicConnectionPublish2Test() throws java.lang.Exception { + super.closedTopicConnectionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java new file mode 100644 index 0000000000..fbaa66e6d9 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java @@ -0,0 +1,217 @@ +package com.sun.ts.tests.jms.core.closedTopicPublisher; + +import com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicPublisherTestsAppclientTest extends com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests { + static final String VEHICLE_ARCHIVE = "closedTopicPublisher_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicPublisher_appclient_vehicle: + closedTopicPublisher_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle: + closedTopicPublisher_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicPublisher_jsp_vehicle: + closedTopicPublisher_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicPublisher_servlet_vehicle: + closedTopicPublisher_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedTopicPublisher/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicPublisher_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicPublisher_appclient_vehicle_client.jar"); + // The class files + closedTopicPublisher_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedTopicPublisher_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicPublisherTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicPublisher_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicPublisher_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicPublisherTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicPublisher_appclient_vehicle_client, ClosedTopicPublisherTests.class, resURL); + + // Ear + EnterpriseArchive closedTopicPublisher_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicPublisher_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicPublisher_appclient_vehicle_ear.addAsModule(closedTopicPublisher_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); + if(earResURL != null) { + closedTopicPublisher_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicPublisher_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicPublisher_appclient_vehicle_ear, ClosedTopicPublisherTests.class, earResURL); + return closedTopicPublisher_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherCloseTest() throws java.lang.Exception { + super.closedTopicPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherGetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherSetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherPublish1Test() throws java.lang.Exception { + super.closedTopicPublisherPublish1Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicPublisherPublish2Test() throws java.lang.Exception { + super.closedTopicPublisherPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java new file mode 100644 index 0000000000..ed362d1087 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java @@ -0,0 +1,255 @@ +package com.sun.ts.tests.jms.core.closedTopicPublisher; + +import com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicPublisherTestsEjbTest extends com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests { + static final String VEHICLE_ARCHIVE = "closedTopicPublisher_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicPublisher_appclient_vehicle: + closedTopicPublisher_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle: + closedTopicPublisher_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicPublisher_jsp_vehicle: + closedTopicPublisher_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicPublisher_servlet_vehicle: + closedTopicPublisher_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedTopicPublisher/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicPublisher_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicPublisher_ejb_vehicle_client.jar"); + // The class files + closedTopicPublisher_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedTopicPublisher_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicPublisherTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicPublisher_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicPublisher_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicPublisherTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicPublisher_ejb_vehicle_client, ClosedTopicPublisherTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedTopicPublisher_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedTopicPublisher_ejb_vehicle_ejb.jar"); + // The class files + closedTopicPublisher_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedTopicPublisherTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedTopicPublisher_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedTopicPublisherTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedTopicPublisher_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedTopicPublisher_ejb_vehicle_ejb, ClosedTopicPublisherTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedTopicPublisher_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicPublisher_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicPublisher_ejb_vehicle_ear.addAsModule(closedTopicPublisher_ejb_vehicle_ejb); + closedTopicPublisher_ejb_vehicle_ear.addAsModule(closedTopicPublisher_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); + if(earResURL != null) { + closedTopicPublisher_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicPublisher_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicPublisher_ejb_vehicle_ear, ClosedTopicPublisherTests.class, earResURL); + return closedTopicPublisher_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherCloseTest() throws java.lang.Exception { + super.closedTopicPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherGetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherSetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherPublish1Test() throws java.lang.Exception { + super.closedTopicPublisherPublish1Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicPublisherPublish2Test() throws java.lang.Exception { + super.closedTopicPublisherPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java new file mode 100644 index 0000000000..c987290f07 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java @@ -0,0 +1,237 @@ +package com.sun.ts.tests.jms.core.closedTopicPublisher; + +import com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicPublisherTestsJspTest extends com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests { + static final String VEHICLE_ARCHIVE = "closedTopicPublisher_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicPublisher_appclient_vehicle: + closedTopicPublisher_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle: + closedTopicPublisher_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicPublisher_jsp_vehicle: + closedTopicPublisher_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicPublisher_servlet_vehicle: + closedTopicPublisher_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicPublisher/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicPublisher_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicPublisher_jsp_vehicle_web.war"); + // The class files + closedTopicPublisher_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicPublisher_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicPublisherTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicPublisher_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicPublisher_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicPublisher_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedTopicPublisher_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedTopicPublisher_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicPublisher_jsp_vehicle_web, ClosedTopicPublisherTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicPublisher_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicPublisher_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicPublisher_jsp_vehicle_ear.addAsModule(closedTopicPublisher_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); + if(earResURL != null) { + closedTopicPublisher_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicPublisher_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicPublisher_jsp_vehicle_ear, ClosedTopicPublisherTests.class, earResURL); + return closedTopicPublisher_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherCloseTest() throws java.lang.Exception { + super.closedTopicPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherGetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherSetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherPublish1Test() throws java.lang.Exception { + super.closedTopicPublisherPublish1Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicPublisherPublish2Test() throws java.lang.Exception { + super.closedTopicPublisherPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java new file mode 100644 index 0000000000..fa038f33df --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java @@ -0,0 +1,230 @@ +package com.sun.ts.tests.jms.core.closedTopicPublisher; + +import com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicPublisherTestsServletTest extends com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests { + static final String VEHICLE_ARCHIVE = "closedTopicPublisher_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicPublisher_appclient_vehicle: + closedTopicPublisher_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle: + closedTopicPublisher_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicPublisher_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicPublisher_jsp_vehicle: + closedTopicPublisher_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicPublisher_servlet_vehicle: + closedTopicPublisher_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicPublisher/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicPublisher_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicPublisher_servlet_vehicle_web.war"); + // The class files + closedTopicPublisher_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicPublisher_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicPublisherTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicPublisher_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicPublisher_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicPublisher_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicPublisher_servlet_vehicle_web, ClosedTopicPublisherTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicPublisher_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicPublisher_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicPublisher_servlet_vehicle_ear.addAsModule(closedTopicPublisher_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); + if(earResURL != null) { + closedTopicPublisher_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicPublisher_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicPublisher_servlet_vehicle_ear, ClosedTopicPublisherTests.class, earResURL); + return closedTopicPublisher_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherCloseTest() throws java.lang.Exception { + super.closedTopicPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherGetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicPublisherSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicPublisherSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherSetPriorityTest() throws java.lang.Exception { + super.closedTopicPublisherSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicPublisherSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherPublish1Test() throws java.lang.Exception { + super.closedTopicPublisherPublish1Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicPublisherPublish2Test() throws java.lang.Exception { + super.closedTopicPublisherPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java new file mode 100644 index 0000000000..c70707cd56 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java @@ -0,0 +1,413 @@ +package com.sun.ts.tests.jms.core.closedTopicSession; + +import com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSessionTestsAppclientTest extends com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests { + static final String VEHICLE_ARCHIVE = "closedTopicSession_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSession_appclient_vehicle: + closedTopicSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle: + closedTopicSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSession_jsp_vehicle: + closedTopicSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSession_servlet_vehicle: + closedTopicSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedTopicSession/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicSession_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicSession_appclient_vehicle_client.jar"); + // The class files + closedTopicSession_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedTopicSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicSession_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicSession_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicSessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicSession_appclient_vehicle_client, ClosedTopicSessionTests.class, resURL); + + // Ear + EnterpriseArchive closedTopicSession_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSession_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSession_appclient_vehicle_ear.addAsModule(closedTopicSession_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); + if(earResURL != null) { + closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSession_appclient_vehicle_ear, ClosedTopicSessionTests.class, earResURL); + return closedTopicSession_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCommitTest() throws java.lang.Exception { + super.closedTopicSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCloseTest() throws java.lang.Exception { + super.closedTopicSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateDurableSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateDurableSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicSessionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionUnsubscribeTest() throws java.lang.Exception { + super.closedTopicSessionUnsubscribeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetTransactedTest() throws java.lang.Exception { + super.closedTopicSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionRollbackTest() throws java.lang.Exception { + super.closedTopicSessionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionRecoverTest() throws java.lang.Exception { + super.closedTopicSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionReceiveTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSessionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicSessionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionPublish1Test() throws java.lang.Exception { + super.closedTopicSessionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSessionPublish2Test() throws java.lang.Exception { + super.closedTopicSessionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java new file mode 100644 index 0000000000..bba70f6acb --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java @@ -0,0 +1,451 @@ +package com.sun.ts.tests.jms.core.closedTopicSession; + +import com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSessionTestsEjbTest extends com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests { + static final String VEHICLE_ARCHIVE = "closedTopicSession_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSession_appclient_vehicle: + closedTopicSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle: + closedTopicSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSession_jsp_vehicle: + closedTopicSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSession_servlet_vehicle: + closedTopicSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedTopicSession/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicSession_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicSession_ejb_vehicle_client.jar"); + // The class files + closedTopicSession_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedTopicSession_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicSession_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicSession_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicSessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicSession_ejb_vehicle_client, ClosedTopicSessionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedTopicSession_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedTopicSession_ejb_vehicle_ejb.jar"); + // The class files + closedTopicSession_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedTopicSession_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedTopicSession_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedTopicSession_ejb_vehicle_ejb, ClosedTopicSessionTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedTopicSession_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSession_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSession_ejb_vehicle_ear.addAsModule(closedTopicSession_ejb_vehicle_ejb); + closedTopicSession_ejb_vehicle_ear.addAsModule(closedTopicSession_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); + if(earResURL != null) { + closedTopicSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSession_ejb_vehicle_ear, ClosedTopicSessionTests.class, earResURL); + return closedTopicSession_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCommitTest() throws java.lang.Exception { + super.closedTopicSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCloseTest() throws java.lang.Exception { + super.closedTopicSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateDurableSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateDurableSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicSessionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionUnsubscribeTest() throws java.lang.Exception { + super.closedTopicSessionUnsubscribeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetTransactedTest() throws java.lang.Exception { + super.closedTopicSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionRollbackTest() throws java.lang.Exception { + super.closedTopicSessionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionRecoverTest() throws java.lang.Exception { + super.closedTopicSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionReceiveTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSessionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicSessionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionPublish1Test() throws java.lang.Exception { + super.closedTopicSessionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSessionPublish2Test() throws java.lang.Exception { + super.closedTopicSessionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java new file mode 100644 index 0000000000..e9b5e4922c --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java @@ -0,0 +1,433 @@ +package com.sun.ts.tests.jms.core.closedTopicSession; + +import com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSessionTestsJspTest extends com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests { + static final String VEHICLE_ARCHIVE = "closedTopicSession_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSession_appclient_vehicle: + closedTopicSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle: + closedTopicSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSession_jsp_vehicle: + closedTopicSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSession_servlet_vehicle: + closedTopicSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicSession/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicSession_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicSession_jsp_vehicle_web.war"); + // The class files + closedTopicSession_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSession_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicSession_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSession_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSession_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedTopicSession_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedTopicSession_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicSession_jsp_vehicle_web, ClosedTopicSessionTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicSession_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSession_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSession_jsp_vehicle_ear.addAsModule(closedTopicSession_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); + if(earResURL != null) { + closedTopicSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSession_jsp_vehicle_ear, ClosedTopicSessionTests.class, earResURL); + return closedTopicSession_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCommitTest() throws java.lang.Exception { + super.closedTopicSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCloseTest() throws java.lang.Exception { + super.closedTopicSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateDurableSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateDurableSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicSessionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionUnsubscribeTest() throws java.lang.Exception { + super.closedTopicSessionUnsubscribeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetTransactedTest() throws java.lang.Exception { + super.closedTopicSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionRollbackTest() throws java.lang.Exception { + super.closedTopicSessionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionRecoverTest() throws java.lang.Exception { + super.closedTopicSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionReceiveTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSessionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicSessionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionPublish1Test() throws java.lang.Exception { + super.closedTopicSessionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSessionPublish2Test() throws java.lang.Exception { + super.closedTopicSessionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java new file mode 100644 index 0000000000..77b3ad1439 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java @@ -0,0 +1,426 @@ +package com.sun.ts.tests.jms.core.closedTopicSession; + +import com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSessionTestsServletTest extends com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests { + static final String VEHICLE_ARCHIVE = "closedTopicSession_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSession_appclient_vehicle: + closedTopicSession_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle: + closedTopicSession_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSession_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSession_jsp_vehicle: + closedTopicSession_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSession_servlet_vehicle: + closedTopicSession_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicSession/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicSession_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicSession_servlet_vehicle_web.war"); + // The class files + closedTopicSession_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSession_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicSessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicSession_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSession_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSession_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicSession_servlet_vehicle_web, ClosedTopicSessionTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicSession_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSession_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSession_servlet_vehicle_ear.addAsModule(closedTopicSession_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); + if(earResURL != null) { + closedTopicSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSession_servlet_vehicle_ear, ClosedTopicSessionTests.class, earResURL); + return closedTopicSession_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCommitTest() throws java.lang.Exception { + super.closedTopicSessionCommitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCloseTest() throws java.lang.Exception { + super.closedTopicSessionCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateDurableSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateDurableSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateDurableSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateSubscriberTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateSubscriberMsgSelectorTest() throws java.lang.Exception { + super.closedTopicSessionCreateSubscriberMsgSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreatePublisherTest() throws java.lang.Exception { + super.closedTopicSessionCreatePublisherTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateTempTopicTest() throws java.lang.Exception { + super.closedTopicSessionCreateTempTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionUnsubscribeTest() throws java.lang.Exception { + super.closedTopicSessionUnsubscribeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateBytesMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateBytesMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateMapMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateMapMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateObjectMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObjectMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateObject2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateObject2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateStreamMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateStreamMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateTextMessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateTextMessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionCreateText2MessageTest() throws java.lang.Exception { + super.closedTopicSessionCreateText2MessageTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetTransactedTest() throws java.lang.Exception { + super.closedTopicSessionGetTransactedTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionRollbackTest() throws java.lang.Exception { + super.closedTopicSessionRollbackTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionRecoverTest() throws java.lang.Exception { + super.closedTopicSessionRecoverTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSessionGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionReceiveTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSessionReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSessionReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSessionGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionSubscriberGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionPublisherCloseTest() throws java.lang.Exception { + super.closedTopicSessionPublisherCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionGetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSetDeliveryModeTest() throws java.lang.Exception { + super.closedTopicSessionSetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSetDisableMessageIDTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSetDisableMessageTimestampTest() throws java.lang.Exception { + super.closedTopicSessionSetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSetPriorityTest() throws java.lang.Exception { + super.closedTopicSessionSetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionSetTimeToLiveTest() throws java.lang.Exception { + super.closedTopicSessionSetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionPublisherGetTopicTest() throws java.lang.Exception { + super.closedTopicSessionPublisherGetTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionPublish1Test() throws java.lang.Exception { + super.closedTopicSessionPublish1Test(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSessionPublish2Test() throws java.lang.Exception { + super.closedTopicSessionPublish2Test(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java new file mode 100644 index 0000000000..5d7791d1fe --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java @@ -0,0 +1,167 @@ +package com.sun.ts.tests.jms.core.closedTopicSubscriber; + +import com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSubscriberTestsAppclientTest extends com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests { + static final String VEHICLE_ARCHIVE = "closedTopicSubscriber_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSubscriber_appclient_vehicle: + closedTopicSubscriber_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle: + closedTopicSubscriber_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSubscriber_jsp_vehicle: + closedTopicSubscriber_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSubscriber_servlet_vehicle: + closedTopicSubscriber_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/closedTopicSubscriber/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicSubscriber_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicSubscriber_appclient_vehicle_client.jar"); + // The class files + closedTopicSubscriber_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + closedTopicSubscriber_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicSubscriberTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicSubscriber_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicSubscriber_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicSubscriberTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicSubscriber_appclient_vehicle_client, ClosedTopicSubscriberTests.class, resURL); + + // Ear + EnterpriseArchive closedTopicSubscriber_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSubscriber_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSubscriber_appclient_vehicle_ear.addAsModule(closedTopicSubscriber_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); + if(earResURL != null) { + closedTopicSubscriber_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSubscriber_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSubscriber_appclient_vehicle_ear, ClosedTopicSubscriberTests.class, earResURL); + return closedTopicSubscriber_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSubscriberGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberReceiveTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSubscriberGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void closedTopicSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSubscriberGetTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java new file mode 100644 index 0000000000..bc8925da9a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java @@ -0,0 +1,203 @@ +package com.sun.ts.tests.jms.core.closedTopicSubscriber; + +import com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSubscriberTestsEjbTest extends com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests { + static final String VEHICLE_ARCHIVE = "closedTopicSubscriber_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSubscriber_appclient_vehicle: + closedTopicSubscriber_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle: + closedTopicSubscriber_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSubscriber_jsp_vehicle: + closedTopicSubscriber_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSubscriber_servlet_vehicle: + closedTopicSubscriber_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/closedTopicSubscriber/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive closedTopicSubscriber_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "closedTopicSubscriber_ejb_vehicle_client.jar"); + // The class files + closedTopicSubscriber_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + closedTopicSubscriber_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ClosedTopicSubscriberTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + closedTopicSubscriber_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + closedTopicSubscriber_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClosedTopicSubscriberTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(closedTopicSubscriber_ejb_vehicle_client, ClosedTopicSubscriberTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive closedTopicSubscriber_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "closedTopicSubscriber_ejb_vehicle_ejb.jar"); + // The class files + closedTopicSubscriber_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ClosedTopicSubscriberTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + closedTopicSubscriber_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ClosedTopicSubscriberTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + closedTopicSubscriber_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(closedTopicSubscriber_ejb_vehicle_ejb, ClosedTopicSubscriberTests.class, ejbResURL); + + // Ear + EnterpriseArchive closedTopicSubscriber_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSubscriber_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSubscriber_ejb_vehicle_ear.addAsModule(closedTopicSubscriber_ejb_vehicle_ejb); + closedTopicSubscriber_ejb_vehicle_ear.addAsModule(closedTopicSubscriber_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); + if(earResURL != null) { + closedTopicSubscriber_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSubscriber_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSubscriber_ejb_vehicle_ear, ClosedTopicSubscriberTests.class, earResURL); + return closedTopicSubscriber_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSubscriberGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberReceiveTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSubscriberGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void closedTopicSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSubscriberGetTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java new file mode 100644 index 0000000000..7486936d5f --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java @@ -0,0 +1,186 @@ +package com.sun.ts.tests.jms.core.closedTopicSubscriber; + +import com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSubscriberTestsJspTest extends com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests { + static final String VEHICLE_ARCHIVE = "closedTopicSubscriber_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSubscriber_appclient_vehicle: + closedTopicSubscriber_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle: + closedTopicSubscriber_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSubscriber_jsp_vehicle: + closedTopicSubscriber_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSubscriber_servlet_vehicle: + closedTopicSubscriber_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicSubscriber/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicSubscriber_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicSubscriber_jsp_vehicle_web.war"); + // The class files + closedTopicSubscriber_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSubscriber_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicSubscriberTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicSubscriber_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSubscriber_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/jsp_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSubscriber_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + closedTopicSubscriber_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + closedTopicSubscriber_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicSubscriber_jsp_vehicle_web, ClosedTopicSubscriberTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicSubscriber_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSubscriber_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSubscriber_jsp_vehicle_ear.addAsModule(closedTopicSubscriber_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); + if(earResURL != null) { + closedTopicSubscriber_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSubscriber_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSubscriber_jsp_vehicle_ear, ClosedTopicSubscriberTests.class, earResURL); + return closedTopicSubscriber_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSubscriberGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberReceiveTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSubscriberGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void closedTopicSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSubscriberGetTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java new file mode 100644 index 0000000000..0872b3541a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java @@ -0,0 +1,179 @@ +package com.sun.ts.tests.jms.core.closedTopicSubscriber; + +import com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClosedTopicSubscriberTestsServletTest extends com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests { + static final String VEHICLE_ARCHIVE = "closedTopicSubscriber_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + closedTopicSubscriber_appclient_vehicle: + closedTopicSubscriber_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle: + closedTopicSubscriber_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + closedTopicSubscriber_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + closedTopicSubscriber_jsp_vehicle: + closedTopicSubscriber_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + closedTopicSubscriber_servlet_vehicle: + closedTopicSubscriber_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/closedTopicSubscriber/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive closedTopicSubscriber_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "closedTopicSubscriber_servlet_vehicle_web.war"); + // The class files + closedTopicSubscriber_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSubscriber_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ClosedTopicSubscriberTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + closedTopicSubscriber_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSubscriber_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/servlet_vehicle_web.xml"); + if(warResURL != null) { + closedTopicSubscriber_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(closedTopicSubscriber_servlet_vehicle_web, ClosedTopicSubscriberTests.class, warResURL); + + // Ear + EnterpriseArchive closedTopicSubscriber_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "closedTopicSubscriber_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + closedTopicSubscriber_servlet_vehicle_ear.addAsModule(closedTopicSubscriber_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); + if(earResURL != null) { + closedTopicSubscriber_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + if(earResURL != null) { + closedTopicSubscriber_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(closedTopicSubscriber_servlet_vehicle_ear, ClosedTopicSubscriberTests.class, earResURL); + return closedTopicSubscriber_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberCloseTest() throws java.lang.Exception { + super.closedTopicSubscriberCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberGetMessageSelectorTest() throws java.lang.Exception { + super.closedTopicSubscriberGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberReceiveTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberReceiveTimeoutTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveTimeoutTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberReceiveNoWaitTest() throws java.lang.Exception { + super.closedTopicSubscriberReceiveNoWaitTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberGetNoLocalTest() throws java.lang.Exception { + super.closedTopicSubscriberGetNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void closedTopicSubscriberGetTopicTest() throws java.lang.Exception { + super.closedTopicSubscriberGetTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java new file mode 100644 index 0000000000..4e44f401d6 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java @@ -0,0 +1,265 @@ +package com.sun.ts.tests.jms.core.exceptionQueue; + +import com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests { + static final String VEHICLE_ARCHIVE = "exceptionQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionQueue_appclient_vehicle: + exceptionQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle: + exceptionQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionQueue_jsp_vehicle: + exceptionQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionQueue_servlet_vehicle: + exceptionQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/exceptionQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive exceptionQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "exceptionQueue_appclient_vehicle_client.jar"); + // The class files + exceptionQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + exceptionQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ExceptionQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + exceptionQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + exceptionQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ExceptionQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(exceptionQueue_appclient_vehicle_client, ExceptionQueueTests.class, resURL); + + // Ear + EnterpriseArchive exceptionQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionQueue_appclient_vehicle_ear.addAsModule(exceptionQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); + if(earResURL != null) { + exceptionQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionQueue_appclient_vehicle_ear, ExceptionQueueTests.class, earResURL); + return exceptionQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void xInvalidDestinationExceptionQTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotReadableExceptionQueueTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionQTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionQTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xNullPointerExceptionQueueTest() throws java.lang.Exception { + super.xNullPointerExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageEOFExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageEOFExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageFormatExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageFormatExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xInvalidSelectorExceptionQueueTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xIllegalStateExceptionQueueTest() throws java.lang.Exception { + super.xIllegalStateExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xUnsupportedOperationExceptionQTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xUnsupportedOperationExceptionQTest2() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xUnsupportedOperationExceptionQTest3() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xInvalidDestinationExceptionQTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotReadableExceptionQBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotReadableExceptionQStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xIllegalStateExceptionTestTopicMethodsQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestTopicMethodsQ(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xIllegalStateExceptionTestRollbackQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestRollbackQ(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java new file mode 100644 index 0000000000..ebeb2c3b81 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java @@ -0,0 +1,301 @@ +package com.sun.ts.tests.jms.core.exceptionQueue; + +import com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionQueueTestsEjbTest extends com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests { + static final String VEHICLE_ARCHIVE = "exceptionQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionQueue_appclient_vehicle: + exceptionQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle: + exceptionQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionQueue_jsp_vehicle: + exceptionQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionQueue_servlet_vehicle: + exceptionQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/exceptionQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive exceptionQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "exceptionQueue_ejb_vehicle_client.jar"); + // The class files + exceptionQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + exceptionQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ExceptionQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + exceptionQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + exceptionQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ExceptionQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(exceptionQueue_ejb_vehicle_client, ExceptionQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive exceptionQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "exceptionQueue_ejb_vehicle_ejb.jar"); + // The class files + exceptionQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ExceptionQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + exceptionQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ExceptionQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + exceptionQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(exceptionQueue_ejb_vehicle_ejb, ExceptionQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive exceptionQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionQueue_ejb_vehicle_ear.addAsModule(exceptionQueue_ejb_vehicle_ejb); + exceptionQueue_ejb_vehicle_ear.addAsModule(exceptionQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); + if(earResURL != null) { + exceptionQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionQueue_ejb_vehicle_ear, ExceptionQueueTests.class, earResURL); + return exceptionQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void xInvalidDestinationExceptionQTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotReadableExceptionQueueTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionQTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionQTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xNullPointerExceptionQueueTest() throws java.lang.Exception { + super.xNullPointerExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageEOFExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageEOFExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageFormatExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageFormatExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xInvalidSelectorExceptionQueueTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xIllegalStateExceptionQueueTest() throws java.lang.Exception { + super.xIllegalStateExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xUnsupportedOperationExceptionQTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xUnsupportedOperationExceptionQTest2() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xUnsupportedOperationExceptionQTest3() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xInvalidDestinationExceptionQTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotReadableExceptionQBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotReadableExceptionQStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xIllegalStateExceptionTestTopicMethodsQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestTopicMethodsQ(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xIllegalStateExceptionTestRollbackQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestRollbackQ(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java new file mode 100644 index 0000000000..e3e97c1098 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java @@ -0,0 +1,284 @@ +package com.sun.ts.tests.jms.core.exceptionQueue; + +import com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionQueueTestsJspTest extends com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests { + static final String VEHICLE_ARCHIVE = "exceptionQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionQueue_appclient_vehicle: + exceptionQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle: + exceptionQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionQueue_jsp_vehicle: + exceptionQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionQueue_servlet_vehicle: + exceptionQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/exceptionQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive exceptionQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "exceptionQueue_jsp_vehicle_web.war"); + // The class files + exceptionQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + exceptionQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ExceptionQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + exceptionQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + exceptionQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + exceptionQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + exceptionQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + exceptionQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(exceptionQueue_jsp_vehicle_web, ExceptionQueueTests.class, warResURL); + + // Ear + EnterpriseArchive exceptionQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionQueue_jsp_vehicle_ear.addAsModule(exceptionQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); + if(earResURL != null) { + exceptionQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionQueue_jsp_vehicle_ear, ExceptionQueueTests.class, earResURL); + return exceptionQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void xInvalidDestinationExceptionQTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotReadableExceptionQueueTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionQTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionQTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xNullPointerExceptionQueueTest() throws java.lang.Exception { + super.xNullPointerExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageEOFExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageEOFExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageFormatExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageFormatExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xInvalidSelectorExceptionQueueTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xIllegalStateExceptionQueueTest() throws java.lang.Exception { + super.xIllegalStateExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xUnsupportedOperationExceptionQTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xUnsupportedOperationExceptionQTest2() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xUnsupportedOperationExceptionQTest3() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xInvalidDestinationExceptionQTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotReadableExceptionQBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotReadableExceptionQStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xIllegalStateExceptionTestTopicMethodsQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestTopicMethodsQ(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xIllegalStateExceptionTestRollbackQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestRollbackQ(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java new file mode 100644 index 0000000000..df835c514d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java @@ -0,0 +1,277 @@ +package com.sun.ts.tests.jms.core.exceptionQueue; + +import com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionQueueTestsServletTest extends com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests { + static final String VEHICLE_ARCHIVE = "exceptionQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionQueue_appclient_vehicle: + exceptionQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle: + exceptionQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionQueue_jsp_vehicle: + exceptionQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionQueue_servlet_vehicle: + exceptionQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/exceptionQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive exceptionQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "exceptionQueue_servlet_vehicle_web.war"); + // The class files + exceptionQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + exceptionQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ExceptionQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + exceptionQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + exceptionQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + exceptionQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(exceptionQueue_servlet_vehicle_web, ExceptionQueueTests.class, warResURL); + + // Ear + EnterpriseArchive exceptionQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionQueue_servlet_vehicle_ear.addAsModule(exceptionQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); + if(earResURL != null) { + exceptionQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionQueue_servlet_vehicle_ear, ExceptionQueueTests.class, earResURL); + return exceptionQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void xInvalidDestinationExceptionQTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotReadableExceptionQueueTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionQTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionQTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionQTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xNullPointerExceptionQueueTest() throws java.lang.Exception { + super.xNullPointerExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageEOFExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageEOFExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageFormatExceptionQTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageFormatExceptionQTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionQTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xInvalidSelectorExceptionQueueTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xIllegalStateExceptionQueueTest() throws java.lang.Exception { + super.xIllegalStateExceptionQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xUnsupportedOperationExceptionQTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xUnsupportedOperationExceptionQTest2() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xUnsupportedOperationExceptionQTest3() throws java.lang.Exception { + super.xUnsupportedOperationExceptionQTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xInvalidDestinationExceptionQTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionQTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotReadableExceptionQBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotReadableExceptionQStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionQStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xIllegalStateExceptionTestTopicMethodsQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestTopicMethodsQ(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xIllegalStateExceptionTestRollbackQ() throws java.lang.Exception { + super.xIllegalStateExceptionTestRollbackQ(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java new file mode 100644 index 0000000000..c468ec3398 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java @@ -0,0 +1,244 @@ +package com.sun.ts.tests.jms.core.exceptionTopic; + +import com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests { + static final String VEHICLE_ARCHIVE = "exceptionTopic_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionTopic_appclient_vehicle: + exceptionTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle: + exceptionTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionTopic_jsp_vehicle: + exceptionTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionTopic_servlet_vehicle: + exceptionTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/exceptionTopic/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive exceptionTopic_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "exceptionTopic_appclient_vehicle_client.jar"); + // The class files + exceptionTopic_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + exceptionTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ExceptionTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + exceptionTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + exceptionTopic_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ExceptionTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(exceptionTopic_appclient_vehicle_client, ExceptionTopicTests.class, resURL); + + // Ear + EnterpriseArchive exceptionTopic_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionTopic_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionTopic_appclient_vehicle_ear.addAsModule(exceptionTopic_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); + if(earResURL != null) { + exceptionTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionTopic_appclient_vehicle_ear, ExceptionTopicTests.class, earResURL); + return exceptionTopic_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void xInvalidDestinationExceptionTopicTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotReadableExceptionTopicTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionTTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotWriteableExceptionTTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xNullPointerExceptionTopicTest() throws java.lang.Exception { + super.xNullPointerExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageEOFExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageEOFExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageFormatExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageFormatExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xInvalidSelectorExceptionTopicTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xIllegalStateExceptionTopicTest() throws java.lang.Exception { + super.xIllegalStateExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xUnsupportedOperationExceptionTTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionTTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xInvalidDestinationExceptionTTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionTTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotReadableExceptionTBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xMessageNotReadableExceptionTStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void xIllegalStateExceptionTestQueueMethodsT() throws java.lang.Exception { + super.xIllegalStateExceptionTestQueueMethodsT(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java new file mode 100644 index 0000000000..31f56d61e9 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java @@ -0,0 +1,280 @@ +package com.sun.ts.tests.jms.core.exceptionTopic; + +import com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionTopicTestsEjbTest extends com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests { + static final String VEHICLE_ARCHIVE = "exceptionTopic_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionTopic_appclient_vehicle: + exceptionTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle: + exceptionTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionTopic_jsp_vehicle: + exceptionTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionTopic_servlet_vehicle: + exceptionTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/exceptionTopic/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive exceptionTopic_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "exceptionTopic_ejb_vehicle_client.jar"); + // The class files + exceptionTopic_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + exceptionTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ExceptionTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + exceptionTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + exceptionTopic_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ExceptionTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(exceptionTopic_ejb_vehicle_client, ExceptionTopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive exceptionTopic_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "exceptionTopic_ejb_vehicle_ejb.jar"); + // The class files + exceptionTopic_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ExceptionTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + exceptionTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ExceptionTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + exceptionTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(exceptionTopic_ejb_vehicle_ejb, ExceptionTopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive exceptionTopic_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionTopic_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionTopic_ejb_vehicle_ear.addAsModule(exceptionTopic_ejb_vehicle_ejb); + exceptionTopic_ejb_vehicle_ear.addAsModule(exceptionTopic_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); + if(earResURL != null) { + exceptionTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionTopic_ejb_vehicle_ear, ExceptionTopicTests.class, earResURL); + return exceptionTopic_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void xInvalidDestinationExceptionTopicTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotReadableExceptionTopicTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionTTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotWriteableExceptionTTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xNullPointerExceptionTopicTest() throws java.lang.Exception { + super.xNullPointerExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageEOFExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageEOFExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageFormatExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageFormatExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xInvalidSelectorExceptionTopicTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xIllegalStateExceptionTopicTest() throws java.lang.Exception { + super.xIllegalStateExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xUnsupportedOperationExceptionTTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionTTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xInvalidDestinationExceptionTTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionTTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotReadableExceptionTBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xMessageNotReadableExceptionTStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void xIllegalStateExceptionTestQueueMethodsT() throws java.lang.Exception { + super.xIllegalStateExceptionTestQueueMethodsT(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java new file mode 100644 index 0000000000..e9b9dca1fe --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java @@ -0,0 +1,263 @@ +package com.sun.ts.tests.jms.core.exceptionTopic; + +import com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionTopicTestsJspTest extends com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests { + static final String VEHICLE_ARCHIVE = "exceptionTopic_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionTopic_appclient_vehicle: + exceptionTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle: + exceptionTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionTopic_jsp_vehicle: + exceptionTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionTopic_servlet_vehicle: + exceptionTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/exceptionTopic/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive exceptionTopic_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "exceptionTopic_jsp_vehicle_web.war"); + // The class files + exceptionTopic_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + exceptionTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ExceptionTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + exceptionTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + exceptionTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/jsp_vehicle_web.xml"); + if(warResURL != null) { + exceptionTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + exceptionTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + exceptionTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(exceptionTopic_jsp_vehicle_web, ExceptionTopicTests.class, warResURL); + + // Ear + EnterpriseArchive exceptionTopic_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionTopic_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionTopic_jsp_vehicle_ear.addAsModule(exceptionTopic_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); + if(earResURL != null) { + exceptionTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionTopic_jsp_vehicle_ear, ExceptionTopicTests.class, earResURL); + return exceptionTopic_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void xInvalidDestinationExceptionTopicTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotReadableExceptionTopicTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionTTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotWriteableExceptionTTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xNullPointerExceptionTopicTest() throws java.lang.Exception { + super.xNullPointerExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageEOFExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageEOFExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageFormatExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageFormatExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xInvalidSelectorExceptionTopicTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xIllegalStateExceptionTopicTest() throws java.lang.Exception { + super.xIllegalStateExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xUnsupportedOperationExceptionTTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionTTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xInvalidDestinationExceptionTTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionTTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotReadableExceptionTBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xMessageNotReadableExceptionTStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void xIllegalStateExceptionTestQueueMethodsT() throws java.lang.Exception { + super.xIllegalStateExceptionTestQueueMethodsT(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java new file mode 100644 index 0000000000..00c62b4f45 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java @@ -0,0 +1,256 @@ +package com.sun.ts.tests.jms.core.exceptionTopic; + +import com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ExceptionTopicTestsServletTest extends com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests { + static final String VEHICLE_ARCHIVE = "exceptionTopic_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + exceptionTopic_appclient_vehicle: + exceptionTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle: + exceptionTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + exceptionTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + exceptionTopic_jsp_vehicle: + exceptionTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + exceptionTopic_servlet_vehicle: + exceptionTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/exceptionTopic/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive exceptionTopic_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "exceptionTopic_servlet_vehicle_web.war"); + // The class files + exceptionTopic_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + exceptionTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ExceptionTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + exceptionTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + exceptionTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/servlet_vehicle_web.xml"); + if(warResURL != null) { + exceptionTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(exceptionTopic_servlet_vehicle_web, ExceptionTopicTests.class, warResURL); + + // Ear + EnterpriseArchive exceptionTopic_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "exceptionTopic_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + exceptionTopic_servlet_vehicle_ear.addAsModule(exceptionTopic_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); + if(earResURL != null) { + exceptionTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + if(earResURL != null) { + exceptionTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(exceptionTopic_servlet_vehicle_ear, ExceptionTopicTests.class, earResURL); + return exceptionTopic_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void xInvalidDestinationExceptionTopicTest() throws java.lang.Exception { + super.xInvalidDestinationExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotReadableExceptionTopicTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionTTestforTextMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforTextMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionTestforBytesMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotWriteableExceptionTTestforMapMessage() throws java.lang.Exception { + super.xMessageNotWriteableExceptionTTestforMapMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xNullPointerExceptionTopicTest() throws java.lang.Exception { + super.xNullPointerExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageEOFExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageEOFExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageEOFExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageFormatExceptionTTestforBytesMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforBytesMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageFormatExceptionTTestforStreamMessage() throws java.lang.Exception { + super.xMessageFormatExceptionTTestforStreamMessage(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xInvalidSelectorExceptionTopicTest() throws java.lang.Exception { + super.xInvalidSelectorExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xIllegalStateExceptionTopicTest() throws java.lang.Exception { + super.xIllegalStateExceptionTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xUnsupportedOperationExceptionTTest1() throws java.lang.Exception { + super.xUnsupportedOperationExceptionTTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xInvalidDestinationExceptionTTests() throws java.lang.Exception { + super.xInvalidDestinationExceptionTTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotReadableExceptionTBytesMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTBytesMsgTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xMessageNotReadableExceptionTStreamMsgTest() throws java.lang.Exception { + super.xMessageNotReadableExceptionTStreamMsgTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void xIllegalStateExceptionTestQueueMethodsT() throws java.lang.Exception { + super.xIllegalStateExceptionTestQueueMethodsT(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java new file mode 100644 index 0000000000..cb93f39767 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java @@ -0,0 +1,201 @@ +package com.sun.ts.tests.jms.core.foreignMsgQueue; + +import com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests { + static final String VEHICLE_ARCHIVE = "foreignMsgQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgQueue_appclient_vehicle: + foreignMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle: + foreignMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgQueue_jsp_vehicle: + foreignMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgQueue_servlet_vehicle: + foreignMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/foreignMsgQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive foreignMsgQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "foreignMsgQueue_appclient_vehicle_client.jar"); + // The class files + foreignMsgQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + foreignMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ForeignMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + foreignMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + foreignMsgQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ForeignMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(foreignMsgQueue_appclient_vehicle_client, ForeignMsgQueueTests.class, resURL); + + // Ear + EnterpriseArchive foreignMsgQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgQueue_appclient_vehicle_ear.addAsModule(foreignMsgQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); + if(earResURL != null) { + foreignMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgQueue_appclient_vehicle_ear, ForeignMsgQueueTests.class, earResURL); + return foreignMsgQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveBytesMsgQueueTest() throws java.lang.Exception { + super.sendReceiveBytesMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveMapMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMapMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveObjectMsgQueueTest() throws java.lang.Exception { + super.sendReceiveObjectMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveStreamMsgQueueTest() throws java.lang.Exception { + super.sendReceiveStreamMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveTextMsgQueueTest() throws java.lang.Exception { + super.sendReceiveTextMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSDestinationQueueTest() throws java.lang.Exception { + super.sendSetsJMSDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSExpirationQueueTest() throws java.lang.Exception { + super.sendSetsJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSPriorityQueueTest() throws java.lang.Exception { + super.sendSetsJMSPriorityQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSMessageIDQueueTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSTimestampQueueTest() throws java.lang.Exception { + super.sendSetsJMSTimestampQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java new file mode 100644 index 0000000000..1af220b5c1 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java @@ -0,0 +1,251 @@ +package com.sun.ts.tests.jms.core.foreignMsgQueue; + +import com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgQueueTestsEjbTest extends com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests { + static final String VEHICLE_ARCHIVE = "foreignMsgQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgQueue_appclient_vehicle: + foreignMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle: + foreignMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgQueue_jsp_vehicle: + foreignMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgQueue_servlet_vehicle: + foreignMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/foreignMsgQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive foreignMsgQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "foreignMsgQueue_ejb_vehicle_client.jar"); + // The class files + foreignMsgQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + foreignMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ForeignMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + foreignMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + foreignMsgQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ForeignMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(foreignMsgQueue_ejb_vehicle_client, ForeignMsgQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive foreignMsgQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "foreignMsgQueue_ejb_vehicle_ejb.jar"); + // The class files + foreignMsgQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ForeignMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + foreignMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ForeignMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + foreignMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(foreignMsgQueue_ejb_vehicle_ejb, ForeignMsgQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive foreignMsgQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgQueue_ejb_vehicle_ear.addAsModule(foreignMsgQueue_ejb_vehicle_ejb); + foreignMsgQueue_ejb_vehicle_ear.addAsModule(foreignMsgQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); + if(earResURL != null) { + foreignMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgQueue_ejb_vehicle_ear, ForeignMsgQueueTests.class, earResURL); + return foreignMsgQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveBytesMsgQueueTest() throws java.lang.Exception { + super.sendReceiveBytesMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveMapMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMapMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveObjectMsgQueueTest() throws java.lang.Exception { + super.sendReceiveObjectMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveStreamMsgQueueTest() throws java.lang.Exception { + super.sendReceiveStreamMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveTextMsgQueueTest() throws java.lang.Exception { + super.sendReceiveTextMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSDestinationQueueTest() throws java.lang.Exception { + super.sendSetsJMSDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSExpirationQueueTest() throws java.lang.Exception { + super.sendSetsJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSPriorityQueueTest() throws java.lang.Exception { + super.sendSetsJMSPriorityQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSMessageIDQueueTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSTimestampQueueTest() throws java.lang.Exception { + super.sendSetsJMSTimestampQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java new file mode 100644 index 0000000000..193e136057 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java @@ -0,0 +1,227 @@ +package com.sun.ts.tests.jms.core.foreignMsgQueue; + +import com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgQueueTestsJspTest extends com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests { + static final String VEHICLE_ARCHIVE = "foreignMsgQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgQueue_appclient_vehicle: + foreignMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle: + foreignMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgQueue_jsp_vehicle: + foreignMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgQueue_servlet_vehicle: + foreignMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/foreignMsgQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive foreignMsgQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "foreignMsgQueue_jsp_vehicle_web.war"); + // The class files + foreignMsgQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ForeignMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + foreignMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + foreignMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + foreignMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(foreignMsgQueue_jsp_vehicle_web, ForeignMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive foreignMsgQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgQueue_jsp_vehicle_ear.addAsModule(foreignMsgQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); + if(earResURL != null) { + foreignMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgQueue_jsp_vehicle_ear, ForeignMsgQueueTests.class, earResURL); + return foreignMsgQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveBytesMsgQueueTest() throws java.lang.Exception { + super.sendReceiveBytesMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveMapMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMapMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveObjectMsgQueueTest() throws java.lang.Exception { + super.sendReceiveObjectMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveStreamMsgQueueTest() throws java.lang.Exception { + super.sendReceiveStreamMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveTextMsgQueueTest() throws java.lang.Exception { + super.sendReceiveTextMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSDestinationQueueTest() throws java.lang.Exception { + super.sendSetsJMSDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSExpirationQueueTest() throws java.lang.Exception { + super.sendSetsJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSPriorityQueueTest() throws java.lang.Exception { + super.sendSetsJMSPriorityQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSMessageIDQueueTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSTimestampQueueTest() throws java.lang.Exception { + super.sendSetsJMSTimestampQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java new file mode 100644 index 0000000000..feb544bf54 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java @@ -0,0 +1,220 @@ +package com.sun.ts.tests.jms.core.foreignMsgQueue; + +import com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgQueueTestsServletTest extends com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests { + static final String VEHICLE_ARCHIVE = "foreignMsgQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgQueue_appclient_vehicle: + foreignMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle: + foreignMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgQueue_jsp_vehicle: + foreignMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgQueue_servlet_vehicle: + foreignMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/foreignMsgQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive foreignMsgQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "foreignMsgQueue_servlet_vehicle_web.war"); + // The class files + foreignMsgQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ForeignMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + foreignMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(foreignMsgQueue_servlet_vehicle_web, ForeignMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive foreignMsgQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgQueue_servlet_vehicle_ear.addAsModule(foreignMsgQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); + if(earResURL != null) { + foreignMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgQueue_servlet_vehicle_ear, ForeignMsgQueueTests.class, earResURL); + return foreignMsgQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveBytesMsgQueueTest() throws java.lang.Exception { + super.sendReceiveBytesMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveMapMsgQueueTest() throws java.lang.Exception { + super.sendReceiveMapMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveObjectMsgQueueTest() throws java.lang.Exception { + super.sendReceiveObjectMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveStreamMsgQueueTest() throws java.lang.Exception { + super.sendReceiveStreamMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveTextMsgQueueTest() throws java.lang.Exception { + super.sendReceiveTextMsgQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSDestinationQueueTest() throws java.lang.Exception { + super.sendSetsJMSDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSExpirationQueueTest() throws java.lang.Exception { + super.sendSetsJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSPriorityQueueTest() throws java.lang.Exception { + super.sendSetsJMSPriorityQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSMessageIDQueueTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSTimestampQueueTest() throws java.lang.Exception { + super.sendSetsJMSTimestampQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java new file mode 100644 index 0000000000..a3a4d72c85 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java @@ -0,0 +1,201 @@ +package com.sun.ts.tests.jms.core.foreignMsgTopic; + +import com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests { + static final String VEHICLE_ARCHIVE = "foreignMsgTopic_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgTopic_appclient_vehicle: + foreignMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle: + foreignMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgTopic_jsp_vehicle: + foreignMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgTopic_servlet_vehicle: + foreignMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/foreignMsgTopic/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive foreignMsgTopic_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "foreignMsgTopic_appclient_vehicle_client.jar"); + // The class files + foreignMsgTopic_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + foreignMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ForeignMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + foreignMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + foreignMsgTopic_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ForeignMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(foreignMsgTopic_appclient_vehicle_client, ForeignMsgTopicTests.class, resURL); + + // Ear + EnterpriseArchive foreignMsgTopic_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgTopic_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgTopic_appclient_vehicle_ear.addAsModule(foreignMsgTopic_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); + if(earResURL != null) { + foreignMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgTopic_appclient_vehicle_ear, ForeignMsgTopicTests.class, earResURL); + return foreignMsgTopic_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveBytesMsgTopicTest() throws java.lang.Exception { + super.sendReceiveBytesMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveMapMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMapMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveObjectMsgTopicTest() throws java.lang.Exception { + super.sendReceiveObjectMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveStreamMsgTopicTest() throws java.lang.Exception { + super.sendReceiveStreamMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendReceiveTextMsgTopicTest() throws java.lang.Exception { + super.sendReceiveTextMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSDestinationTopicTest() throws java.lang.Exception { + super.sendSetsJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSExpirationTopicTest() throws java.lang.Exception { + super.sendSetsJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSPriorityTopicTest() throws java.lang.Exception { + super.sendSetsJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSMessageIDTopicTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendSetsJMSTimestampTopicTest() throws java.lang.Exception { + super.sendSetsJMSTimestampTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java new file mode 100644 index 0000000000..659d05b228 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java @@ -0,0 +1,249 @@ +package com.sun.ts.tests.jms.core.foreignMsgTopic; + +import com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgTopicTestsEjbTest extends com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests { + static final String VEHICLE_ARCHIVE = "foreignMsgTopic_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgTopic_appclient_vehicle: + foreignMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle: + foreignMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgTopic_jsp_vehicle: + foreignMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgTopic_servlet_vehicle: + foreignMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/foreignMsgTopic/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive foreignMsgTopic_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "foreignMsgTopic_ejb_vehicle_client.jar"); + // The class files + foreignMsgTopic_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + foreignMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ForeignMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + foreignMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + foreignMsgTopic_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ForeignMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(foreignMsgTopic_ejb_vehicle_client, ForeignMsgTopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive foreignMsgTopic_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "foreignMsgTopic_ejb_vehicle_ejb.jar"); + // The class files + foreignMsgTopic_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ForeignMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + foreignMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ForeignMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + foreignMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(foreignMsgTopic_ejb_vehicle_ejb, ForeignMsgTopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive foreignMsgTopic_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgTopic_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgTopic_ejb_vehicle_ear.addAsModule(foreignMsgTopic_ejb_vehicle_ejb); + foreignMsgTopic_ejb_vehicle_ear.addAsModule(foreignMsgTopic_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); + if(earResURL != null) { + foreignMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgTopic_ejb_vehicle_ear, ForeignMsgTopicTests.class, earResURL); + return foreignMsgTopic_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveBytesMsgTopicTest() throws java.lang.Exception { + super.sendReceiveBytesMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveMapMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMapMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveObjectMsgTopicTest() throws java.lang.Exception { + super.sendReceiveObjectMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveStreamMsgTopicTest() throws java.lang.Exception { + super.sendReceiveStreamMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendReceiveTextMsgTopicTest() throws java.lang.Exception { + super.sendReceiveTextMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSDestinationTopicTest() throws java.lang.Exception { + super.sendSetsJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSExpirationTopicTest() throws java.lang.Exception { + super.sendSetsJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSPriorityTopicTest() throws java.lang.Exception { + super.sendSetsJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSMessageIDTopicTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendSetsJMSTimestampTopicTest() throws java.lang.Exception { + super.sendSetsJMSTimestampTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java new file mode 100644 index 0000000000..714a0268eb --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java @@ -0,0 +1,226 @@ +package com.sun.ts.tests.jms.core.foreignMsgTopic; + +import com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgTopicTestsJspTest extends com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests { + static final String VEHICLE_ARCHIVE = "foreignMsgTopic_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgTopic_appclient_vehicle: + foreignMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle: + foreignMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgTopic_jsp_vehicle: + foreignMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgTopic_servlet_vehicle: + foreignMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/foreignMsgTopic/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive foreignMsgTopic_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "foreignMsgTopic_jsp_vehicle_web.war"); + // The class files + foreignMsgTopic_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ForeignMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + foreignMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/jsp_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + foreignMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + foreignMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(foreignMsgTopic_jsp_vehicle_web, ForeignMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive foreignMsgTopic_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgTopic_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgTopic_jsp_vehicle_ear.addAsModule(foreignMsgTopic_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); + if(earResURL != null) { + foreignMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgTopic_jsp_vehicle_ear, ForeignMsgTopicTests.class, earResURL); + return foreignMsgTopic_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveBytesMsgTopicTest() throws java.lang.Exception { + super.sendReceiveBytesMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveMapMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMapMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveObjectMsgTopicTest() throws java.lang.Exception { + super.sendReceiveObjectMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveStreamMsgTopicTest() throws java.lang.Exception { + super.sendReceiveStreamMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendReceiveTextMsgTopicTest() throws java.lang.Exception { + super.sendReceiveTextMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSDestinationTopicTest() throws java.lang.Exception { + super.sendSetsJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSExpirationTopicTest() throws java.lang.Exception { + super.sendSetsJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSPriorityTopicTest() throws java.lang.Exception { + super.sendSetsJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSMessageIDTopicTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendSetsJMSTimestampTopicTest() throws java.lang.Exception { + super.sendSetsJMSTimestampTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java new file mode 100644 index 0000000000..f96758427a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java @@ -0,0 +1,219 @@ +package com.sun.ts.tests.jms.core.foreignMsgTopic; + +import com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ForeignMsgTopicTestsServletTest extends com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests { + static final String VEHICLE_ARCHIVE = "foreignMsgTopic_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + foreignMsgTopic_appclient_vehicle: + foreignMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle: + foreignMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + foreignMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + foreignMsgTopic_jsp_vehicle: + foreignMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + foreignMsgTopic_servlet_vehicle: + foreignMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/foreignMsgTopic/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive foreignMsgTopic_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "foreignMsgTopic_servlet_vehicle_web.war"); + // The class files + foreignMsgTopic_servlet_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.StreamMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.ObjectMessageTestImpl.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.MapMessageTestImpl.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.common.BytesMessageTestImpl.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ForeignMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + foreignMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/servlet_vehicle_web.xml"); + if(warResURL != null) { + foreignMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(foreignMsgTopic_servlet_vehicle_web, ForeignMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive foreignMsgTopic_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "foreignMsgTopic_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + foreignMsgTopic_servlet_vehicle_ear.addAsModule(foreignMsgTopic_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); + if(earResURL != null) { + foreignMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + foreignMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(foreignMsgTopic_servlet_vehicle_ear, ForeignMsgTopicTests.class, earResURL); + return foreignMsgTopic_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveBytesMsgTopicTest() throws java.lang.Exception { + super.sendReceiveBytesMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveMapMsgTopicTest() throws java.lang.Exception { + super.sendReceiveMapMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveObjectMsgTopicTest() throws java.lang.Exception { + super.sendReceiveObjectMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveStreamMsgTopicTest() throws java.lang.Exception { + super.sendReceiveStreamMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendReceiveTextMsgTopicTest() throws java.lang.Exception { + super.sendReceiveTextMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSDestinationTopicTest() throws java.lang.Exception { + super.sendSetsJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSExpirationTopicTest() throws java.lang.Exception { + super.sendSetsJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSPriorityTopicTest() throws java.lang.Exception { + super.sendSetsJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSMessageIDTopicTest() throws java.lang.Exception { + super.sendSetsJMSMessageIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendSetsJMSTimestampTopicTest() throws java.lang.Exception { + super.sendSetsJMSTimestampTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java new file mode 100644 index 0000000000..eaa0f0dce6 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java @@ -0,0 +1,216 @@ +package com.sun.ts.tests.jms.core.mapMsgQueue; + +import com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests { + static final String VEHICLE_ARCHIVE = "mapMsgQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgQueue_appclient_vehicle: + mapMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle: + mapMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgQueue_jsp_vehicle: + mapMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgQueue_servlet_vehicle: + mapMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/mapMsgQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mapMsgQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "mapMsgQueue_appclient_vehicle_client.jar"); + // The class files + mapMsgQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + mapMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MapMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + mapMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + mapMsgQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MapMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mapMsgQueue_appclient_vehicle_client, MapMsgQueueTests.class, resURL); + + // Ear + EnterpriseArchive mapMsgQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgQueue_appclient_vehicle_ear.addAsModule(mapMsgQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); + if(earResURL != null) { + mapMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgQueue_appclient_vehicle_ear, MapMsgQueueTests.class, earResURL); + return mapMsgQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void mapMessageFullMsgQTest() throws java.lang.Exception { + super.mapMessageFullMsgQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsByte() throws java.lang.Exception { + super.MapMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsShort() throws java.lang.Exception { + super.MapMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsChar() throws java.lang.Exception { + super.MapMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsInt() throws java.lang.Exception { + super.MapMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsLong() throws java.lang.Exception { + super.MapMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsFloat() throws java.lang.Exception { + super.MapMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsDouble() throws java.lang.Exception { + super.MapMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsString() throws java.lang.Exception { + super.MapMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsBytes() throws java.lang.Exception { + super.MapMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void mapMessageQNotWritable() throws java.lang.Exception { + super.mapMessageQNotWritable(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void mapMessageQIllegalarg() throws java.lang.Exception { + super.mapMessageQIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java new file mode 100644 index 0000000000..dd6b17dd84 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java @@ -0,0 +1,254 @@ +package com.sun.ts.tests.jms.core.mapMsgQueue; + +import com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgQueueTestsEjbTest extends com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests { + static final String VEHICLE_ARCHIVE = "mapMsgQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgQueue_appclient_vehicle: + mapMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle: + mapMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgQueue_jsp_vehicle: + mapMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgQueue_servlet_vehicle: + mapMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/mapMsgQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mapMsgQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "mapMsgQueue_ejb_vehicle_client.jar"); + // The class files + mapMsgQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + mapMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MapMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + mapMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + mapMsgQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MapMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mapMsgQueue_ejb_vehicle_client, MapMsgQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mapMsgQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "mapMsgQueue_ejb_vehicle_ejb.jar"); + // The class files + mapMsgQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MapMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + mapMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MapMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mapMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mapMsgQueue_ejb_vehicle_ejb, MapMsgQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive mapMsgQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgQueue_ejb_vehicle_ear.addAsModule(mapMsgQueue_ejb_vehicle_ejb); + mapMsgQueue_ejb_vehicle_ear.addAsModule(mapMsgQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); + if(earResURL != null) { + mapMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgQueue_ejb_vehicle_ear, MapMsgQueueTests.class, earResURL); + return mapMsgQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void mapMessageFullMsgQTest() throws java.lang.Exception { + super.mapMessageFullMsgQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsByte() throws java.lang.Exception { + super.MapMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsShort() throws java.lang.Exception { + super.MapMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsChar() throws java.lang.Exception { + super.MapMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsInt() throws java.lang.Exception { + super.MapMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsLong() throws java.lang.Exception { + super.MapMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsFloat() throws java.lang.Exception { + super.MapMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsDouble() throws java.lang.Exception { + super.MapMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsString() throws java.lang.Exception { + super.MapMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsBytes() throws java.lang.Exception { + super.MapMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void mapMessageQNotWritable() throws java.lang.Exception { + super.mapMessageQNotWritable(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void mapMessageQIllegalarg() throws java.lang.Exception { + super.mapMessageQIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java new file mode 100644 index 0000000000..02096176da --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java @@ -0,0 +1,236 @@ +package com.sun.ts.tests.jms.core.mapMsgQueue; + +import com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgQueueTestsJspTest extends com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests { + static final String VEHICLE_ARCHIVE = "mapMsgQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgQueue_appclient_vehicle: + mapMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle: + mapMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgQueue_jsp_vehicle: + mapMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgQueue_servlet_vehicle: + mapMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/mapMsgQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive mapMsgQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "mapMsgQueue_jsp_vehicle_web.war"); + // The class files + mapMsgQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class + ); + // The web.xml descriptor + URL warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + mapMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MapMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + mapMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + mapMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + mapMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + mapMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + mapMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(mapMsgQueue_jsp_vehicle_web, MapMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive mapMsgQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgQueue_jsp_vehicle_ear.addAsModule(mapMsgQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); + if(earResURL != null) { + mapMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgQueue_jsp_vehicle_ear, MapMsgQueueTests.class, earResURL); + return mapMsgQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void mapMessageFullMsgQTest() throws java.lang.Exception { + super.mapMessageFullMsgQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsByte() throws java.lang.Exception { + super.MapMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsShort() throws java.lang.Exception { + super.MapMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsChar() throws java.lang.Exception { + super.MapMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsInt() throws java.lang.Exception { + super.MapMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsLong() throws java.lang.Exception { + super.MapMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsFloat() throws java.lang.Exception { + super.MapMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsDouble() throws java.lang.Exception { + super.MapMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsString() throws java.lang.Exception { + super.MapMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsBytes() throws java.lang.Exception { + super.MapMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void mapMessageQNotWritable() throws java.lang.Exception { + super.mapMessageQNotWritable(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void mapMessageQIllegalarg() throws java.lang.Exception { + super.mapMessageQIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java new file mode 100644 index 0000000000..518e2e0c70 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java @@ -0,0 +1,229 @@ +package com.sun.ts.tests.jms.core.mapMsgQueue; + +import com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgQueueTestsServletTest extends com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests { + static final String VEHICLE_ARCHIVE = "mapMsgQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgQueue_appclient_vehicle: + mapMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle: + mapMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgQueue_jsp_vehicle: + mapMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgQueue_servlet_vehicle: + mapMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/mapMsgQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive mapMsgQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "mapMsgQueue_servlet_vehicle_web.war"); + // The class files + mapMsgQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests.class + ); + // The web.xml descriptor + URL warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + mapMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MapMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + mapMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + mapMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + mapMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(mapMsgQueue_servlet_vehicle_web, MapMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive mapMsgQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgQueue_servlet_vehicle_ear.addAsModule(mapMsgQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); + if(earResURL != null) { + mapMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgQueue_servlet_vehicle_ear, MapMsgQueueTests.class, earResURL); + return mapMsgQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void mapMessageFullMsgQTest() throws java.lang.Exception { + super.mapMessageFullMsgQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsByte() throws java.lang.Exception { + super.MapMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsShort() throws java.lang.Exception { + super.MapMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsChar() throws java.lang.Exception { + super.MapMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsInt() throws java.lang.Exception { + super.MapMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsLong() throws java.lang.Exception { + super.MapMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsFloat() throws java.lang.Exception { + super.MapMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsDouble() throws java.lang.Exception { + super.MapMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsString() throws java.lang.Exception { + super.MapMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsBytes() throws java.lang.Exception { + super.MapMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void mapMessageQNotWritable() throws java.lang.Exception { + super.mapMessageQNotWritable(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void mapMessageQIllegalarg() throws java.lang.Exception { + super.mapMessageQIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java new file mode 100644 index 0000000000..f749b997a2 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java @@ -0,0 +1,216 @@ +package com.sun.ts.tests.jms.core.mapMsgTopic; + +import com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests { + static final String VEHICLE_ARCHIVE = "mapMsgTopic_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgTopic_appclient_vehicle: + mapMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle: + mapMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgTopic_jsp_vehicle: + mapMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgTopic_servlet_vehicle: + mapMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/mapMsgTopic/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mapMsgTopic_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "mapMsgTopic_appclient_vehicle_client.jar"); + // The class files + mapMsgTopic_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + mapMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MapMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + mapMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + mapMsgTopic_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MapMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mapMsgTopic_appclient_vehicle_client, MapMsgTopicTests.class, resURL); + + // Ear + EnterpriseArchive mapMsgTopic_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgTopic_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgTopic_appclient_vehicle_ear.addAsModule(mapMsgTopic_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); + if(earResURL != null) { + mapMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgTopic_appclient_vehicle_ear, MapMsgTopicTests.class, earResURL); + return mapMsgTopic_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void mapMessageFullMsgTopicTest() throws java.lang.Exception { + super.mapMessageFullMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsByte() throws java.lang.Exception { + super.MapMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsShort() throws java.lang.Exception { + super.MapMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsChar() throws java.lang.Exception { + super.MapMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsInt() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsLong() throws java.lang.Exception { + super.MapMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.MapMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.MapMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void MapMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void mapMessageTNotWritable() throws java.lang.Exception { + super.mapMessageTNotWritable(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void mapMessageTIllegalarg() throws java.lang.Exception { + super.mapMessageTIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java new file mode 100644 index 0000000000..55d504b2ff --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java @@ -0,0 +1,252 @@ +package com.sun.ts.tests.jms.core.mapMsgTopic; + +import com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgTopicTestsEjbTest extends com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests { + static final String VEHICLE_ARCHIVE = "mapMsgTopic_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgTopic_appclient_vehicle: + mapMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle: + mapMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgTopic_jsp_vehicle: + mapMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgTopic_servlet_vehicle: + mapMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/mapMsgTopic/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mapMsgTopic_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "mapMsgTopic_ejb_vehicle_client.jar"); + // The class files + mapMsgTopic_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + mapMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MapMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + mapMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + mapMsgTopic_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MapMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mapMsgTopic_ejb_vehicle_client, MapMsgTopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mapMsgTopic_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "mapMsgTopic_ejb_vehicle_ejb.jar"); + // The class files + mapMsgTopic_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MapMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + mapMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MapMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mapMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mapMsgTopic_ejb_vehicle_ejb, MapMsgTopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive mapMsgTopic_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgTopic_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgTopic_ejb_vehicle_ear.addAsModule(mapMsgTopic_ejb_vehicle_ejb); + mapMsgTopic_ejb_vehicle_ear.addAsModule(mapMsgTopic_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); + if(earResURL != null) { + mapMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgTopic_ejb_vehicle_ear, MapMsgTopicTests.class, earResURL); + return mapMsgTopic_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void mapMessageFullMsgTopicTest() throws java.lang.Exception { + super.mapMessageFullMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsByte() throws java.lang.Exception { + super.MapMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsShort() throws java.lang.Exception { + super.MapMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsChar() throws java.lang.Exception { + super.MapMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsInt() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsLong() throws java.lang.Exception { + super.MapMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.MapMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.MapMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void MapMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void mapMessageTNotWritable() throws java.lang.Exception { + super.mapMessageTNotWritable(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void mapMessageTIllegalarg() throws java.lang.Exception { + super.mapMessageTIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java new file mode 100644 index 0000000000..328c746b71 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java @@ -0,0 +1,235 @@ +package com.sun.ts.tests.jms.core.mapMsgTopic; + +import com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgTopicTestsJspTest extends com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests { + static final String VEHICLE_ARCHIVE = "mapMsgTopic_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgTopic_appclient_vehicle: + mapMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle: + mapMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgTopic_jsp_vehicle: + mapMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgTopic_servlet_vehicle: + mapMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/mapMsgTopic/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive mapMsgTopic_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "mapMsgTopic_jsp_vehicle_web.war"); + // The class files + mapMsgTopic_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + mapMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MapMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + mapMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + mapMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/jsp_vehicle_web.xml"); + if(warResURL != null) { + mapMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + mapMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + mapMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(mapMsgTopic_jsp_vehicle_web, MapMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive mapMsgTopic_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgTopic_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgTopic_jsp_vehicle_ear.addAsModule(mapMsgTopic_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); + if(earResURL != null) { + mapMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgTopic_jsp_vehicle_ear, MapMsgTopicTests.class, earResURL); + return mapMsgTopic_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void mapMessageFullMsgTopicTest() throws java.lang.Exception { + super.mapMessageFullMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsByte() throws java.lang.Exception { + super.MapMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsShort() throws java.lang.Exception { + super.MapMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsChar() throws java.lang.Exception { + super.MapMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsInt() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsLong() throws java.lang.Exception { + super.MapMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.MapMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.MapMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void MapMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void mapMessageTNotWritable() throws java.lang.Exception { + super.mapMessageTNotWritable(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void mapMessageTIllegalarg() throws java.lang.Exception { + super.mapMessageTIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java new file mode 100644 index 0000000000..b1a76a5802 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java @@ -0,0 +1,228 @@ +package com.sun.ts.tests.jms.core.mapMsgTopic; + +import com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MapMsgTopicTestsServletTest extends com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests { + static final String VEHICLE_ARCHIVE = "mapMsgTopic_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + mapMsgTopic_appclient_vehicle: + mapMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle: + mapMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + mapMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + mapMsgTopic_jsp_vehicle: + mapMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + mapMsgTopic_servlet_vehicle: + mapMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/mapMsgTopic/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive mapMsgTopic_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "mapMsgTopic_servlet_vehicle_web.war"); + // The class files + mapMsgTopic_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + mapMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MapMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + mapMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + mapMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/servlet_vehicle_web.xml"); + if(warResURL != null) { + mapMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(mapMsgTopic_servlet_vehicle_web, MapMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive mapMsgTopic_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mapMsgTopic_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mapMsgTopic_servlet_vehicle_ear.addAsModule(mapMsgTopic_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); + if(earResURL != null) { + mapMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + mapMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mapMsgTopic_servlet_vehicle_ear, MapMsgTopicTests.class, earResURL); + return mapMsgTopic_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void mapMessageFullMsgTopicTest() throws java.lang.Exception { + super.mapMessageFullMsgTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsByte() throws java.lang.Exception { + super.MapMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsShort() throws java.lang.Exception { + super.MapMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsChar() throws java.lang.Exception { + super.MapMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsInt() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsLong() throws java.lang.Exception { + super.MapMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.MapMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.MapMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.MapMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void MapMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.MapMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void mapMessageTNotWritable() throws java.lang.Exception { + super.mapMessageTNotWritable(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void mapMessageTIllegalarg() throws java.lang.Exception { + super.mapMessageTIllegalarg(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java new file mode 100644 index 0000000000..806b4b81dd --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java @@ -0,0 +1,160 @@ +package com.sun.ts.tests.jms.core.messageProducer; + +import com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MessageProducerTestsAppclientTest extends com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests { + static final String VEHICLE_ARCHIVE = "messageProducer_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + messageProducer_appclient_vehicle: + messageProducer_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle: + messageProducer_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageProducer_jsp_vehicle: + messageProducer_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageProducer_servlet_vehicle: + messageProducer_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/messageProducer/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive messageProducer_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "messageProducer_appclient_vehicle_client.jar"); + // The class files + messageProducer_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests.class + ); + // The application-client.xml descriptor + URL resURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + messageProducer_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MessageProducerTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + messageProducer_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + messageProducer_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MessageProducerTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(messageProducer_appclient_vehicle_client, MessageProducerTests.class, resURL); + + // Ear + EnterpriseArchive messageProducer_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageProducer_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageProducer_appclient_vehicle_ear.addAsModule(messageProducer_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); + if(earResURL != null) { + messageProducer_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + if(earResURL != null) { + messageProducer_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageProducer_appclient_vehicle_ear, MessageProducerTests.class, earResURL); + return messageProducer_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendQueueTest1() throws java.lang.Exception { + super.sendQueueTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendQueueTest2() throws java.lang.Exception { + super.sendQueueTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendQueueTest3() throws java.lang.Exception { + super.sendQueueTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendTopicTest4() throws java.lang.Exception { + super.sendTopicTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendTopicTest5() throws java.lang.Exception { + super.sendTopicTest5(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendTopicTest6() throws java.lang.Exception { + super.sendTopicTest6(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java new file mode 100644 index 0000000000..3bda688a34 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java @@ -0,0 +1,196 @@ +package com.sun.ts.tests.jms.core.messageProducer; + +import com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MessageProducerTestsEjbTest extends com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests { + static final String VEHICLE_ARCHIVE = "messageProducer_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + messageProducer_appclient_vehicle: + messageProducer_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle: + messageProducer_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageProducer_jsp_vehicle: + messageProducer_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageProducer_servlet_vehicle: + messageProducer_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/messageProducer/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive messageProducer_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "messageProducer_ejb_vehicle_client.jar"); + // The class files + messageProducer_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + messageProducer_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MessageProducerTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + messageProducer_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + messageProducer_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MessageProducerTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(messageProducer_ejb_vehicle_client, MessageProducerTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive messageProducer_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "messageProducer_ejb_vehicle_ejb.jar"); + // The class files + messageProducer_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MessageProducerTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + messageProducer_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MessageProducerTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + messageProducer_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(messageProducer_ejb_vehicle_ejb, MessageProducerTests.class, ejbResURL); + + // Ear + EnterpriseArchive messageProducer_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageProducer_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageProducer_ejb_vehicle_ear.addAsModule(messageProducer_ejb_vehicle_ejb); + messageProducer_ejb_vehicle_ear.addAsModule(messageProducer_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); + if(earResURL != null) { + messageProducer_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + if(earResURL != null) { + messageProducer_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageProducer_ejb_vehicle_ear, MessageProducerTests.class, earResURL); + return messageProducer_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendQueueTest1() throws java.lang.Exception { + super.sendQueueTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendQueueTest2() throws java.lang.Exception { + super.sendQueueTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendQueueTest3() throws java.lang.Exception { + super.sendQueueTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendTopicTest4() throws java.lang.Exception { + super.sendTopicTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendTopicTest5() throws java.lang.Exception { + super.sendTopicTest5(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendTopicTest6() throws java.lang.Exception { + super.sendTopicTest6(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java new file mode 100644 index 0000000000..e3c513695a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java @@ -0,0 +1,179 @@ +package com.sun.ts.tests.jms.core.messageProducer; + +import com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MessageProducerTestsJspTest extends com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests { + static final String VEHICLE_ARCHIVE = "messageProducer_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + messageProducer_appclient_vehicle: + messageProducer_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle: + messageProducer_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageProducer_jsp_vehicle: + messageProducer_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageProducer_servlet_vehicle: + messageProducer_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/messageProducer/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive messageProducer_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "messageProducer_jsp_vehicle_web.war"); + // The class files + messageProducer_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests.class + ); + // The web.xml descriptor + URL warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + messageProducer_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MessageProducerTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + messageProducer_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + messageProducer_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/jsp_vehicle_web.xml"); + if(warResURL != null) { + messageProducer_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + messageProducer_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + messageProducer_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(messageProducer_jsp_vehicle_web, MessageProducerTests.class, warResURL); + + // Ear + EnterpriseArchive messageProducer_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageProducer_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageProducer_jsp_vehicle_ear.addAsModule(messageProducer_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); + if(earResURL != null) { + messageProducer_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + if(earResURL != null) { + messageProducer_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageProducer_jsp_vehicle_ear, MessageProducerTests.class, earResURL); + return messageProducer_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendQueueTest1() throws java.lang.Exception { + super.sendQueueTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendQueueTest2() throws java.lang.Exception { + super.sendQueueTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendQueueTest3() throws java.lang.Exception { + super.sendQueueTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendTopicTest4() throws java.lang.Exception { + super.sendTopicTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendTopicTest5() throws java.lang.Exception { + super.sendTopicTest5(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendTopicTest6() throws java.lang.Exception { + super.sendTopicTest6(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java new file mode 100644 index 0000000000..6f1ed2bd55 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java @@ -0,0 +1,172 @@ +package com.sun.ts.tests.jms.core.messageProducer; + +import com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MessageProducerTestsServletTest extends com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests { + static final String VEHICLE_ARCHIVE = "messageProducer_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + messageProducer_appclient_vehicle: + messageProducer_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle: + messageProducer_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageProducer_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageProducer_jsp_vehicle: + messageProducer_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageProducer_servlet_vehicle: + messageProducer_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/messageProducer/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive messageProducer_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "messageProducer_servlet_vehicle_web.war"); + // The class files + messageProducer_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests.class + ); + // The web.xml descriptor + URL warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + messageProducer_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MessageProducerTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + messageProducer_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + messageProducer_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/servlet_vehicle_web.xml"); + if(warResURL != null) { + messageProducer_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(messageProducer_servlet_vehicle_web, MessageProducerTests.class, warResURL); + + // Ear + EnterpriseArchive messageProducer_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageProducer_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageProducer_servlet_vehicle_ear.addAsModule(messageProducer_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); + if(earResURL != null) { + messageProducer_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + if(earResURL != null) { + messageProducer_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageProducer_servlet_vehicle_ear, MessageProducerTests.class, earResURL); + return messageProducer_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendQueueTest1() throws java.lang.Exception { + super.sendQueueTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendQueueTest2() throws java.lang.Exception { + super.sendQueueTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendQueueTest3() throws java.lang.Exception { + super.sendQueueTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendTopicTest4() throws java.lang.Exception { + super.sendTopicTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendTopicTest5() throws java.lang.Exception { + super.sendTopicTest5(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendTopicTest6() throws java.lang.Exception { + super.sendTopicTest6(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java new file mode 100644 index 0000000000..cd49253af8 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java @@ -0,0 +1,132 @@ +package com.sun.ts.tests.jms.core.objectMsgQueue; + +import com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ObjectMsgQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests { + static final String VEHICLE_ARCHIVE = "objectMsgQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + objectMsgQueue_appclient_vehicle: + objectMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle: + objectMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + objectMsgQueue_jsp_vehicle: + objectMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + objectMsgQueue_servlet_vehicle: + objectMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/objectMsgQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive objectMsgQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "objectMsgQueue_appclient_vehicle_client.jar"); + // The class files + objectMsgQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests.class + ); + // The application-client.xml descriptor + URL resURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + objectMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ObjectMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + objectMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + objectMsgQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ObjectMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(objectMsgQueue_appclient_vehicle_client, ObjectMsgQueueTests.class, resURL); + + // Ear + EnterpriseArchive objectMsgQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "objectMsgQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + objectMsgQueue_appclient_vehicle_ear.addAsModule(objectMsgQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); + if(earResURL != null) { + objectMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + objectMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(objectMsgQueue_appclient_vehicle_ear, ObjectMsgQueueTests.class, earResURL); + return objectMsgQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageObjectCopyQTest() throws java.lang.Exception { + super.messageObjectCopyQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void notWritableTest() throws java.lang.Exception { + super.notWritableTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java new file mode 100644 index 0000000000..e02f8f45a5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java @@ -0,0 +1,168 @@ +package com.sun.ts.tests.jms.core.objectMsgQueue; + +import com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ObjectMsgQueueTestsEjbTest extends com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests { + static final String VEHICLE_ARCHIVE = "objectMsgQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + objectMsgQueue_appclient_vehicle: + objectMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle: + objectMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + objectMsgQueue_jsp_vehicle: + objectMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + objectMsgQueue_servlet_vehicle: + objectMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/objectMsgQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive objectMsgQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "objectMsgQueue_ejb_vehicle_client.jar"); + // The class files + objectMsgQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + objectMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = ObjectMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + objectMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + objectMsgQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ObjectMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(objectMsgQueue_ejb_vehicle_client, ObjectMsgQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive objectMsgQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "objectMsgQueue_ejb_vehicle_ejb.jar"); + // The class files + objectMsgQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = ObjectMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + objectMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = ObjectMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + objectMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(objectMsgQueue_ejb_vehicle_ejb, ObjectMsgQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive objectMsgQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "objectMsgQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + objectMsgQueue_ejb_vehicle_ear.addAsModule(objectMsgQueue_ejb_vehicle_ejb); + objectMsgQueue_ejb_vehicle_ear.addAsModule(objectMsgQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); + if(earResURL != null) { + objectMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + objectMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(objectMsgQueue_ejb_vehicle_ear, ObjectMsgQueueTests.class, earResURL); + return objectMsgQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageObjectCopyQTest() throws java.lang.Exception { + super.messageObjectCopyQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void notWritableTest() throws java.lang.Exception { + super.notWritableTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java new file mode 100644 index 0000000000..ac45706df2 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.objectMsgQueue; + +import com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ObjectMsgQueueTestsJspTest extends com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests { + static final String VEHICLE_ARCHIVE = "objectMsgQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + objectMsgQueue_appclient_vehicle: + objectMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle: + objectMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + objectMsgQueue_jsp_vehicle: + objectMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + objectMsgQueue_servlet_vehicle: + objectMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/objectMsgQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive objectMsgQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "objectMsgQueue_jsp_vehicle_web.war"); + // The class files + objectMsgQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests.class + ); + // The web.xml descriptor + URL warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + objectMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ObjectMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + objectMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + objectMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + objectMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + objectMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + objectMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(objectMsgQueue_jsp_vehicle_web, ObjectMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive objectMsgQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "objectMsgQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + objectMsgQueue_jsp_vehicle_ear.addAsModule(objectMsgQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); + if(earResURL != null) { + objectMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + objectMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(objectMsgQueue_jsp_vehicle_ear, ObjectMsgQueueTests.class, earResURL); + return objectMsgQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageObjectCopyQTest() throws java.lang.Exception { + super.messageObjectCopyQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void notWritableTest() throws java.lang.Exception { + super.notWritableTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java new file mode 100644 index 0000000000..6826f372ce --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java @@ -0,0 +1,144 @@ +package com.sun.ts.tests.jms.core.objectMsgQueue; + +import com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ObjectMsgQueueTestsServletTest extends com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests { + static final String VEHICLE_ARCHIVE = "objectMsgQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + objectMsgQueue_appclient_vehicle: + objectMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle: + objectMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + objectMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + objectMsgQueue_jsp_vehicle: + objectMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + objectMsgQueue_servlet_vehicle: + objectMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/objectMsgQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive objectMsgQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "objectMsgQueue_servlet_vehicle_web.war"); + // The class files + objectMsgQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests.class + ); + // The web.xml descriptor + URL warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + objectMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = ObjectMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + objectMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + objectMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + objectMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(objectMsgQueue_servlet_vehicle_web, ObjectMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive objectMsgQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "objectMsgQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + objectMsgQueue_servlet_vehicle_ear.addAsModule(objectMsgQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); + if(earResURL != null) { + objectMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + objectMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(objectMsgQueue_servlet_vehicle_ear, ObjectMsgQueueTests.class, earResURL); + return objectMsgQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageObjectCopyQTest() throws java.lang.Exception { + super.messageObjectCopyQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void notWritableTest() throws java.lang.Exception { + super.notWritableTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java new file mode 100644 index 0000000000..f366648ebd --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java @@ -0,0 +1,132 @@ +package com.sun.ts.tests.jms.core.queueConnection; + +import com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueConnectionTestsAppclientTest extends com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests { + static final String VEHICLE_ARCHIVE = "queueConnection_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + queueConnection_appclient_vehicle: + queueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle: + queueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueConnection_jsp_vehicle: + queueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueConnection_servlet_vehicle: + queueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/queueConnection/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueConnection_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueConnection_appclient_vehicle_client.jar"); + // The class files + queueConnection_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + queueConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueConnection_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueConnection_appclient_vehicle_client, QueueConnectionTests.class, resURL); + + // Ear + EnterpriseArchive queueConnection_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueConnection_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueConnection_appclient_vehicle_ear.addAsModule(queueConnection_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); + if(earResURL != null) { + queueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + queueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueConnection_appclient_vehicle_ear, QueueConnectionTests.class, earResURL); + return queueConnection_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void connNotStartedQueueTest() throws java.lang.Exception { + super.connNotStartedQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java new file mode 100644 index 0000000000..80a045974c --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java @@ -0,0 +1,168 @@ +package com.sun.ts.tests.jms.core.queueConnection; + +import com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueConnectionTestsEjbTest extends com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests { + static final String VEHICLE_ARCHIVE = "queueConnection_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + queueConnection_appclient_vehicle: + queueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle: + queueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueConnection_jsp_vehicle: + queueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueConnection_servlet_vehicle: + queueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/queueConnection/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueConnection_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueConnection_ejb_vehicle_client.jar"); + // The class files + queueConnection_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + queueConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueConnection_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueConnection_ejb_vehicle_client, QueueConnectionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queueConnection_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "queueConnection_ejb_vehicle_ejb.jar"); + // The class files + queueConnection_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = QueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + queueConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = QueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queueConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queueConnection_ejb_vehicle_ejb, QueueConnectionTests.class, ejbResURL); + + // Ear + EnterpriseArchive queueConnection_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueConnection_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueConnection_ejb_vehicle_ear.addAsModule(queueConnection_ejb_vehicle_ejb); + queueConnection_ejb_vehicle_ear.addAsModule(queueConnection_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); + if(earResURL != null) { + queueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + queueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueConnection_ejb_vehicle_ear, QueueConnectionTests.class, earResURL); + return queueConnection_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void connNotStartedQueueTest() throws java.lang.Exception { + super.connNotStartedQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java new file mode 100644 index 0000000000..a57fe2e7f6 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.queueConnection; + +import com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueConnectionTestsJspTest extends com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests { + static final String VEHICLE_ARCHIVE = "queueConnection_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + queueConnection_appclient_vehicle: + queueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle: + queueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueConnection_jsp_vehicle: + queueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueConnection_servlet_vehicle: + queueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queueConnection/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queueConnection_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "queueConnection_jsp_vehicle_web.war"); + // The class files + queueConnection_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queueConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + queueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + queueConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queueConnection_jsp_vehicle_web, QueueConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive queueConnection_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueConnection_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueConnection_jsp_vehicle_ear.addAsModule(queueConnection_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); + if(earResURL != null) { + queueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + queueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueConnection_jsp_vehicle_ear, QueueConnectionTests.class, earResURL); + return queueConnection_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void connNotStartedQueueTest() throws java.lang.Exception { + super.connNotStartedQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java new file mode 100644 index 0000000000..f3b7095f49 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java @@ -0,0 +1,144 @@ +package com.sun.ts.tests.jms.core.queueConnection; + +import com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueConnectionTestsServletTest extends com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests { + static final String VEHICLE_ARCHIVE = "queueConnection_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + queueConnection_appclient_vehicle: + queueConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle: + queueConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueConnection_jsp_vehicle: + queueConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueConnection_servlet_vehicle: + queueConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queueConnection/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queueConnection_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "queueConnection_servlet_vehicle_web.war"); + // The class files + queueConnection_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueueConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queueConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queueConnection_servlet_vehicle_web, QueueConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive queueConnection_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueConnection_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueConnection_servlet_vehicle_ear.addAsModule(queueConnection_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); + if(earResURL != null) { + queueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + if(earResURL != null) { + queueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueConnection_servlet_vehicle_ear, QueueConnectionTests.class, earResURL); + return queueConnection_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void connNotStartedQueueTest() throws java.lang.Exception { + super.connNotStartedQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java new file mode 100644 index 0000000000..aa94790251 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java @@ -0,0 +1,188 @@ +package com.sun.ts.tests.jms.core.queueMsgHeaders; + +import com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueHeaderTestsAppclientTest extends com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests { + static final String VEHICLE_ARCHIVE = "queueMsgHeaders_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgHeaders_appclient_vehicle: + queueMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle: + queueMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgHeaders_jsp_vehicle: + queueMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgHeaders_servlet_vehicle: + queueMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/queueMsgHeaders/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueMsgHeaders_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueMsgHeaders_appclient_vehicle_client.jar"); + // The class files + queueMsgHeaders_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + queueMsgHeaders_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueMsgHeaders_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueMsgHeaders_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueHeaderTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueMsgHeaders_appclient_vehicle_client, QueueHeaderTests.class, resURL); + + // Ear + EnterpriseArchive queueMsgHeaders_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgHeaders_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgHeaders_appclient_vehicle_ear.addAsModule(queueMsgHeaders_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); + if(earResURL != null) { + queueMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgHeaders_appclient_vehicle_ear, QueueHeaderTests.class, earResURL); + return queueMsgHeaders_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrIDQTest() throws java.lang.Exception { + super.msgHdrIDQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrTimeStampQTest() throws java.lang.Exception { + super.msgHdrTimeStampQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrCorlIdQTest() throws java.lang.Exception { + super.msgHdrCorlIdQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrReplyToQTest() throws java.lang.Exception { + super.msgHdrReplyToQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSTypeQTest() throws java.lang.Exception { + super.msgHdrJMSTypeQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSPriorityQTest() throws java.lang.Exception { + super.msgHdrJMSPriorityQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSExpirationQueueTest() throws java.lang.Exception { + super.msgHdrJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDestinationQTest() throws java.lang.Exception { + super.msgHdrJMSDestinationQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDeliveryModeQTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSRedeliveredTest() throws java.lang.Exception { + super.msgHdrJMSRedeliveredTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java new file mode 100644 index 0000000000..d13929d839 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java @@ -0,0 +1,224 @@ +package com.sun.ts.tests.jms.core.queueMsgHeaders; + +import com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueHeaderTestsEjbTest extends com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests { + static final String VEHICLE_ARCHIVE = "queueMsgHeaders_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgHeaders_appclient_vehicle: + queueMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle: + queueMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgHeaders_jsp_vehicle: + queueMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgHeaders_servlet_vehicle: + queueMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/queueMsgHeaders/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueMsgHeaders_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueMsgHeaders_ejb_vehicle_client.jar"); + // The class files + queueMsgHeaders_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + queueMsgHeaders_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueMsgHeaders_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueMsgHeaders_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueHeaderTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueMsgHeaders_ejb_vehicle_client, QueueHeaderTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queueMsgHeaders_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "queueMsgHeaders_ejb_vehicle_ejb.jar"); + // The class files + queueMsgHeaders_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = QueueHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + queueMsgHeaders_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = QueueHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queueMsgHeaders_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queueMsgHeaders_ejb_vehicle_ejb, QueueHeaderTests.class, ejbResURL); + + // Ear + EnterpriseArchive queueMsgHeaders_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgHeaders_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgHeaders_ejb_vehicle_ear.addAsModule(queueMsgHeaders_ejb_vehicle_ejb); + queueMsgHeaders_ejb_vehicle_ear.addAsModule(queueMsgHeaders_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); + if(earResURL != null) { + queueMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgHeaders_ejb_vehicle_ear, QueueHeaderTests.class, earResURL); + return queueMsgHeaders_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrIDQTest() throws java.lang.Exception { + super.msgHdrIDQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrTimeStampQTest() throws java.lang.Exception { + super.msgHdrTimeStampQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrCorlIdQTest() throws java.lang.Exception { + super.msgHdrCorlIdQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrReplyToQTest() throws java.lang.Exception { + super.msgHdrReplyToQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSTypeQTest() throws java.lang.Exception { + super.msgHdrJMSTypeQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSPriorityQTest() throws java.lang.Exception { + super.msgHdrJMSPriorityQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSExpirationQueueTest() throws java.lang.Exception { + super.msgHdrJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDestinationQTest() throws java.lang.Exception { + super.msgHdrJMSDestinationQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDeliveryModeQTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSRedeliveredTest() throws java.lang.Exception { + super.msgHdrJMSRedeliveredTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java new file mode 100644 index 0000000000..3e21d55336 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java @@ -0,0 +1,207 @@ +package com.sun.ts.tests.jms.core.queueMsgHeaders; + +import com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueHeaderTestsJspTest extends com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests { + static final String VEHICLE_ARCHIVE = "queueMsgHeaders_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgHeaders_appclient_vehicle: + queueMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle: + queueMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgHeaders_jsp_vehicle: + queueMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgHeaders_servlet_vehicle: + queueMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queueMsgHeaders/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queueMsgHeaders_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "queueMsgHeaders_jsp_vehicle_web.war"); + // The class files + queueMsgHeaders_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueMsgHeaders_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueueHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queueMsgHeaders_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + queueMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + queueMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queueMsgHeaders_jsp_vehicle_web, QueueHeaderTests.class, warResURL); + + // Ear + EnterpriseArchive queueMsgHeaders_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgHeaders_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgHeaders_jsp_vehicle_ear.addAsModule(queueMsgHeaders_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); + if(earResURL != null) { + queueMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgHeaders_jsp_vehicle_ear, QueueHeaderTests.class, earResURL); + return queueMsgHeaders_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrIDQTest() throws java.lang.Exception { + super.msgHdrIDQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrTimeStampQTest() throws java.lang.Exception { + super.msgHdrTimeStampQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrCorlIdQTest() throws java.lang.Exception { + super.msgHdrCorlIdQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrReplyToQTest() throws java.lang.Exception { + super.msgHdrReplyToQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSTypeQTest() throws java.lang.Exception { + super.msgHdrJMSTypeQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSPriorityQTest() throws java.lang.Exception { + super.msgHdrJMSPriorityQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSExpirationQueueTest() throws java.lang.Exception { + super.msgHdrJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDestinationQTest() throws java.lang.Exception { + super.msgHdrJMSDestinationQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDeliveryModeQTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSRedeliveredTest() throws java.lang.Exception { + super.msgHdrJMSRedeliveredTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java new file mode 100644 index 0000000000..f4fc17badf --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java @@ -0,0 +1,200 @@ +package com.sun.ts.tests.jms.core.queueMsgHeaders; + +import com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueHeaderTestsServletTest extends com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests { + static final String VEHICLE_ARCHIVE = "queueMsgHeaders_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgHeaders_appclient_vehicle: + queueMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle: + queueMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgHeaders_jsp_vehicle: + queueMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgHeaders_servlet_vehicle: + queueMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queueMsgHeaders/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queueMsgHeaders_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "queueMsgHeaders_servlet_vehicle_web.war"); + // The class files + queueMsgHeaders_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueMsgHeaders_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueueHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queueMsgHeaders_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueMsgHeaders_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueMsgHeaders_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queueMsgHeaders_servlet_vehicle_web, QueueHeaderTests.class, warResURL); + + // Ear + EnterpriseArchive queueMsgHeaders_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgHeaders_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgHeaders_servlet_vehicle_ear.addAsModule(queueMsgHeaders_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); + if(earResURL != null) { + queueMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgHeaders_servlet_vehicle_ear, QueueHeaderTests.class, earResURL); + return queueMsgHeaders_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrIDQTest() throws java.lang.Exception { + super.msgHdrIDQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrTimeStampQTest() throws java.lang.Exception { + super.msgHdrTimeStampQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrCorlIdQTest() throws java.lang.Exception { + super.msgHdrCorlIdQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrReplyToQTest() throws java.lang.Exception { + super.msgHdrReplyToQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSTypeQTest() throws java.lang.Exception { + super.msgHdrJMSTypeQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSPriorityQTest() throws java.lang.Exception { + super.msgHdrJMSPriorityQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSExpirationQueueTest() throws java.lang.Exception { + super.msgHdrJMSExpirationQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDestinationQTest() throws java.lang.Exception { + super.msgHdrJMSDestinationQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDeliveryModeQTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSRedeliveredTest() throws java.lang.Exception { + super.msgHdrJMSRedeliveredTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java new file mode 100644 index 0000000000..5b61213092 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java @@ -0,0 +1,139 @@ +package com.sun.ts.tests.jms.core.queueMsgProperties; + +import com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueuePropertyTestsAppclientTest extends com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests { + static final String VEHICLE_ARCHIVE = "queueMsgProperties_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgProperties_appclient_vehicle: + queueMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle: + queueMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgProperties_jsp_vehicle: + queueMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgProperties_servlet_vehicle: + queueMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/queueMsgProperties/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueMsgProperties_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueMsgProperties_appclient_vehicle_client.jar"); + // The class files + queueMsgProperties_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + queueMsgProperties_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueuePropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueMsgProperties_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueMsgProperties_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueuePropertyTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueMsgProperties_appclient_vehicle_client, QueuePropertyTests.class, resURL); + + // Ear + EnterpriseArchive queueMsgProperties_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgProperties_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgProperties_appclient_vehicle_ear.addAsModule(queueMsgProperties_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); + if(earResURL != null) { + queueMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgProperties_appclient_vehicle_ear, QueuePropertyTests.class, earResURL); + return queueMsgProperties_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesQTest() throws java.lang.Exception { + super.msgPropertiesQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesConversionQTest() throws java.lang.Exception { + super.msgPropertiesConversionQTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java new file mode 100644 index 0000000000..becd0ad928 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java @@ -0,0 +1,175 @@ +package com.sun.ts.tests.jms.core.queueMsgProperties; + +import com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueuePropertyTestsEjbTest extends com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests { + static final String VEHICLE_ARCHIVE = "queueMsgProperties_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgProperties_appclient_vehicle: + queueMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle: + queueMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgProperties_jsp_vehicle: + queueMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgProperties_servlet_vehicle: + queueMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/queueMsgProperties/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queueMsgProperties_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queueMsgProperties_ejb_vehicle_client.jar"); + // The class files + queueMsgProperties_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + queueMsgProperties_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueuePropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queueMsgProperties_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queueMsgProperties_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueuePropertyTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queueMsgProperties_ejb_vehicle_client, QueuePropertyTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queueMsgProperties_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "queueMsgProperties_ejb_vehicle_ejb.jar"); + // The class files + queueMsgProperties_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = QueuePropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + queueMsgProperties_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = QueuePropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queueMsgProperties_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queueMsgProperties_ejb_vehicle_ejb, QueuePropertyTests.class, ejbResURL); + + // Ear + EnterpriseArchive queueMsgProperties_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgProperties_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgProperties_ejb_vehicle_ear.addAsModule(queueMsgProperties_ejb_vehicle_ejb); + queueMsgProperties_ejb_vehicle_ear.addAsModule(queueMsgProperties_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); + if(earResURL != null) { + queueMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgProperties_ejb_vehicle_ear, QueuePropertyTests.class, earResURL); + return queueMsgProperties_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesQTest() throws java.lang.Exception { + super.msgPropertiesQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesConversionQTest() throws java.lang.Exception { + super.msgPropertiesConversionQTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java new file mode 100644 index 0000000000..9490e07c47 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java @@ -0,0 +1,158 @@ +package com.sun.ts.tests.jms.core.queueMsgProperties; + +import com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueuePropertyTestsJspTest extends com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests { + static final String VEHICLE_ARCHIVE = "queueMsgProperties_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgProperties_appclient_vehicle: + queueMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle: + queueMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgProperties_jsp_vehicle: + queueMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgProperties_servlet_vehicle: + queueMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queueMsgProperties/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queueMsgProperties_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "queueMsgProperties_jsp_vehicle_web.war"); + // The class files + queueMsgProperties_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueMsgProperties_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueuePropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queueMsgProperties_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/jsp_vehicle_web.xml"); + if(warResURL != null) { + queueMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + queueMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + queueMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queueMsgProperties_jsp_vehicle_web, QueuePropertyTests.class, warResURL); + + // Ear + EnterpriseArchive queueMsgProperties_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgProperties_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgProperties_jsp_vehicle_ear.addAsModule(queueMsgProperties_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); + if(earResURL != null) { + queueMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgProperties_jsp_vehicle_ear, QueuePropertyTests.class, earResURL); + return queueMsgProperties_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesQTest() throws java.lang.Exception { + super.msgPropertiesQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesConversionQTest() throws java.lang.Exception { + super.msgPropertiesConversionQTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java new file mode 100644 index 0000000000..0d98494afe --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.queueMsgProperties; + +import com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueuePropertyTestsServletTest extends com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests { + static final String VEHICLE_ARCHIVE = "queueMsgProperties_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + queueMsgProperties_appclient_vehicle: + queueMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle: + queueMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queueMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queueMsgProperties_jsp_vehicle: + queueMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queueMsgProperties_servlet_vehicle: + queueMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queueMsgProperties/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queueMsgProperties_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "queueMsgProperties_servlet_vehicle_web.war"); + // The class files + queueMsgProperties_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueMsgProperties_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueuePropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queueMsgProperties_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueMsgProperties_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/servlet_vehicle_web.xml"); + if(warResURL != null) { + queueMsgProperties_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queueMsgProperties_servlet_vehicle_web, QueuePropertyTests.class, warResURL); + + // Ear + EnterpriseArchive queueMsgProperties_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queueMsgProperties_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queueMsgProperties_servlet_vehicle_ear.addAsModule(queueMsgProperties_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); + if(earResURL != null) { + queueMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + queueMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queueMsgProperties_servlet_vehicle_ear, QueuePropertyTests.class, earResURL); + return queueMsgProperties_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesQTest() throws java.lang.Exception { + super.msgPropertiesQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesConversionQTest() throws java.lang.Exception { + super.msgPropertiesConversionQTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java new file mode 100644 index 0000000000..692971b1e5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java @@ -0,0 +1,213 @@ +package com.sun.ts.tests.jms.core.queuetests; + +import com.sun.ts.tests.jms.core.queuetests.QueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueTestsAppclientTest extends com.sun.ts.tests.jms.core.queuetests.QueueTests { + static final String VEHICLE_ARCHIVE = "queuetests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + queuetests_appclient_vehicle: + queuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle: + queuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queuetests_jsp_vehicle: + queuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queuetests_servlet_vehicle: + queuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/queuetests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queuetests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queuetests_appclient_vehicle_client.jar"); + // The class files + queuetests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core.queuetests.QueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.SessionThread.class + ); + // The application-client.xml descriptor + URL resURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + queuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queuetests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queuetests_appclient_vehicle_client, QueueTests.class, resURL); + + // Ear + EnterpriseArchive queuetests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queuetests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queuetests_appclient_vehicle_ear.addAsModule(queuetests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); + if(earResURL != null) { + queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + if(earResURL != null) { + queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queuetests_appclient_vehicle_ear, QueueTests.class, earResURL); + return queuetests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void emptyMsgsQueueTest() throws java.lang.Exception { + super.emptyMsgsQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void autoAckQueueTest() throws java.lang.Exception { + super.autoAckQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void simpleSendReceiveQueueTest() throws java.lang.Exception { + super.simpleSendReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageOrderQueueTest() throws java.lang.Exception { + super.messageOrderQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void temporaryQueueNotConsumableTest() throws java.lang.Exception { + super.temporaryQueueNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageSelectorMsgRemainsOnQueueTest() throws java.lang.Exception { + super.messageSelectorMsgRemainsOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgSelectorMsgHeaderQueueTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueBrowserMsgsRemainOnQueueTest() throws java.lang.Exception { + super.queueBrowserMsgsRemainOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inactiveClientReceiveQueueTest() throws java.lang.Exception { + super.inactiveClientReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgProducerNullDestinationQueueTest() throws java.lang.Exception { + super.msgProducerNullDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void multipleCloseQueueConnectionTest() throws java.lang.Exception { + super.multipleCloseQueueConnectionTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageOrderDeliveryModeQueueTest() throws java.lang.Exception { + super.messageOrderDeliveryModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void tempQueueTests() throws java.lang.Exception { + super.tempQueueTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java new file mode 100644 index 0000000000..b520185370 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java @@ -0,0 +1,257 @@ +package com.sun.ts.tests.jms.core.queuetests; + +import com.sun.ts.tests.jms.core.queuetests.QueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueTestsEjbTest extends com.sun.ts.tests.jms.core.queuetests.QueueTests { + static final String VEHICLE_ARCHIVE = "queuetests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + queuetests_appclient_vehicle: + queuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle: + queuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queuetests_jsp_vehicle: + queuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queuetests_servlet_vehicle: + queuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/queuetests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queuetests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "queuetests_ejb_vehicle_client.jar"); + // The class files + queuetests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + queuetests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + queuetests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + queuetests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + QueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queuetests_ejb_vehicle_client, QueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queuetests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "queuetests_ejb_vehicle_ejb.jar"); + // The class files + queuetests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.queuetests.QueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.SessionThread.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + queuetests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queuetests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queuetests_ejb_vehicle_ejb, QueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive queuetests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queuetests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queuetests_ejb_vehicle_ear.addAsModule(queuetests_ejb_vehicle_ejb); + queuetests_ejb_vehicle_ear.addAsModule(queuetests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); + if(earResURL != null) { + queuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + if(earResURL != null) { + queuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queuetests_ejb_vehicle_ear, QueueTests.class, earResURL); + return queuetests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void emptyMsgsQueueTest() throws java.lang.Exception { + super.emptyMsgsQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void autoAckQueueTest() throws java.lang.Exception { + super.autoAckQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void simpleSendReceiveQueueTest() throws java.lang.Exception { + super.simpleSendReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageOrderQueueTest() throws java.lang.Exception { + super.messageOrderQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void temporaryQueueNotConsumableTest() throws java.lang.Exception { + super.temporaryQueueNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageSelectorMsgRemainsOnQueueTest() throws java.lang.Exception { + super.messageSelectorMsgRemainsOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgSelectorMsgHeaderQueueTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueBrowserMsgsRemainOnQueueTest() throws java.lang.Exception { + super.queueBrowserMsgsRemainOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inactiveClientReceiveQueueTest() throws java.lang.Exception { + super.inactiveClientReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgProducerNullDestinationQueueTest() throws java.lang.Exception { + super.msgProducerNullDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void multipleCloseQueueConnectionTest() throws java.lang.Exception { + super.multipleCloseQueueConnectionTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageOrderDeliveryModeQueueTest() throws java.lang.Exception { + super.messageOrderDeliveryModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void tempQueueTests() throws java.lang.Exception { + super.tempQueueTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java new file mode 100644 index 0000000000..d266da5a1b --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java @@ -0,0 +1,236 @@ +package com.sun.ts.tests.jms.core.queuetests; + +import com.sun.ts.tests.jms.core.queuetests.QueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueTestsJspTest extends com.sun.ts.tests.jms.core.queuetests.QueueTests { + static final String VEHICLE_ARCHIVE = "queuetests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + queuetests_appclient_vehicle: + queuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle: + queuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queuetests_jsp_vehicle: + queuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queuetests_servlet_vehicle: + queuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queuetests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queuetests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "queuetests_jsp_vehicle_web.war"); + // The class files + queuetests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core.queuetests.QueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.SessionThread.class + ); + // The web.xml descriptor + URL warResURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queuetests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queuetests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + queuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/jsp_vehicle_web.xml"); + if(warResURL != null) { + queuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + queuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + queuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queuetests_jsp_vehicle_web, QueueTests.class, warResURL); + + // Ear + EnterpriseArchive queuetests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queuetests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queuetests_jsp_vehicle_ear.addAsModule(queuetests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); + if(earResURL != null) { + queuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + if(earResURL != null) { + queuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queuetests_jsp_vehicle_ear, QueueTests.class, earResURL); + return queuetests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void emptyMsgsQueueTest() throws java.lang.Exception { + super.emptyMsgsQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void autoAckQueueTest() throws java.lang.Exception { + super.autoAckQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void simpleSendReceiveQueueTest() throws java.lang.Exception { + super.simpleSendReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageOrderQueueTest() throws java.lang.Exception { + super.messageOrderQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void temporaryQueueNotConsumableTest() throws java.lang.Exception { + super.temporaryQueueNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageSelectorMsgRemainsOnQueueTest() throws java.lang.Exception { + super.messageSelectorMsgRemainsOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgSelectorMsgHeaderQueueTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueBrowserMsgsRemainOnQueueTest() throws java.lang.Exception { + super.queueBrowserMsgsRemainOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inactiveClientReceiveQueueTest() throws java.lang.Exception { + super.inactiveClientReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgProducerNullDestinationQueueTest() throws java.lang.Exception { + super.msgProducerNullDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void multipleCloseQueueConnectionTest() throws java.lang.Exception { + super.multipleCloseQueueConnectionTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageOrderDeliveryModeQueueTest() throws java.lang.Exception { + super.messageOrderDeliveryModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void tempQueueTests() throws java.lang.Exception { + super.tempQueueTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java new file mode 100644 index 0000000000..4755fc69bd --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java @@ -0,0 +1,229 @@ +package com.sun.ts.tests.jms.core.queuetests; + +import com.sun.ts.tests.jms.core.queuetests.QueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class QueueTestsServletTest extends com.sun.ts.tests.jms.core.queuetests.QueueTests { + static final String VEHICLE_ARCHIVE = "queuetests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + queuetests_appclient_vehicle: + queuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle: + queuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + queuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + queuetests_jsp_vehicle: + queuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + queuetests_servlet_vehicle: + queuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/queuetests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive queuetests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "queuetests_servlet_vehicle_web.war"); + // The class files + queuetests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.SessionThread.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class, + com.sun.ts.tests.jms.common.TestMessageListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core.queuetests.QueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.common.DoneLatch.class, + com.sun.ts.tests.jms.common.SessionThread.class + ); + // The web.xml descriptor + URL warResURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queuetests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = QueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + queuetests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + queuetests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/servlet_vehicle_web.xml"); + if(warResURL != null) { + queuetests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(queuetests_servlet_vehicle_web, QueueTests.class, warResURL); + + // Ear + EnterpriseArchive queuetests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "queuetests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queuetests_servlet_vehicle_ear.addAsModule(queuetests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); + if(earResURL != null) { + queuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + if(earResURL != null) { + queuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queuetests_servlet_vehicle_ear, QueueTests.class, earResURL); + return queuetests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void emptyMsgsQueueTest() throws java.lang.Exception { + super.emptyMsgsQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void autoAckQueueTest() throws java.lang.Exception { + super.autoAckQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void simpleSendReceiveQueueTest() throws java.lang.Exception { + super.simpleSendReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageOrderQueueTest() throws java.lang.Exception { + super.messageOrderQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void temporaryQueueNotConsumableTest() throws java.lang.Exception { + super.temporaryQueueNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageSelectorMsgRemainsOnQueueTest() throws java.lang.Exception { + super.messageSelectorMsgRemainsOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgSelectorMsgHeaderQueueTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueBrowserMsgsRemainOnQueueTest() throws java.lang.Exception { + super.queueBrowserMsgsRemainOnQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inactiveClientReceiveQueueTest() throws java.lang.Exception { + super.inactiveClientReceiveQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgProducerNullDestinationQueueTest() throws java.lang.Exception { + super.msgProducerNullDestinationQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void multipleCloseQueueConnectionTest() throws java.lang.Exception { + super.multipleCloseQueueConnectionTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageOrderDeliveryModeQueueTest() throws java.lang.Exception { + super.messageOrderDeliveryModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void tempQueueTests() throws java.lang.Exception { + super.tempQueueTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java new file mode 100644 index 0000000000..1b7aa82bb4 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java @@ -0,0 +1,881 @@ +package com.sun.ts.tests.jms.core.selectorQueue; + +import com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests { + static final String VEHICLE_ARCHIVE = "selectorQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorQueue_appclient_vehicle: + selectorQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle: + selectorQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorQueue_jsp_vehicle: + selectorQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorQueue_servlet_vehicle: + selectorQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/selectorQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive selectorQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "selectorQueue_appclient_vehicle_client.jar"); + // The class files + selectorQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + selectorQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + selectorQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + selectorQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MsgSelectorQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(selectorQueue_appclient_vehicle_client, MsgSelectorQueueTests.class, resURL); + + // Ear + EnterpriseArchive selectorQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorQueue_appclient_vehicle_ear.addAsModule(selectorQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); + if(earResURL != null) { + selectorQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + if(earResURL != null) { + selectorQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorQueue_appclient_vehicle_ear, MsgSelectorQueueTests.class, earResURL); + return selectorQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest02() throws java.lang.Exception { + super.selectorTest02(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest03() throws java.lang.Exception { + super.selectorTest03(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest04() throws java.lang.Exception { + super.selectorTest04(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest05() throws java.lang.Exception { + super.selectorTest05(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest06() throws java.lang.Exception { + super.selectorTest06(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest07() throws java.lang.Exception { + super.selectorTest07(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest08() throws java.lang.Exception { + super.selectorTest08(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest09() throws java.lang.Exception { + super.selectorTest09(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest11() throws java.lang.Exception { + super.selectorTest11(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest12() throws java.lang.Exception { + super.selectorTest12(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest02() throws java.lang.Exception { + super.identifierTest02(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest03() throws java.lang.Exception { + super.identifierTest03(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest04() throws java.lang.Exception { + super.identifierTest04(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest05() throws java.lang.Exception { + super.identifierTest05(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest06() throws java.lang.Exception { + super.identifierTest06(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest07() throws java.lang.Exception { + super.identifierTest07(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest08() throws java.lang.Exception { + super.identifierTest08(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest09() throws java.lang.Exception { + super.identifierTest09(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest10() throws java.lang.Exception { + super.identifierTest10(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest11() throws java.lang.Exception { + super.identifierTest11(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest12() throws java.lang.Exception { + super.identifierTest12(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest13() throws java.lang.Exception { + super.identifierTest13(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest14() throws java.lang.Exception { + super.identifierTest14(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void whitespaceTest2() throws java.lang.Exception { + super.whitespaceTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void whitespaceTest3() throws java.lang.Exception { + super.whitespaceTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void whitespaceTest4() throws java.lang.Exception { + super.whitespaceTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void expressionTest2() throws java.lang.Exception { + super.expressionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void expressionTest3() throws java.lang.Exception { + super.expressionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bracketingTest2() throws java.lang.Exception { + super.bracketingTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bracketingTest3() throws java.lang.Exception { + super.bracketingTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bracketingTest4() throws java.lang.Exception { + super.bracketingTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest02() throws java.lang.Exception { + super.comparisonTest02(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest03() throws java.lang.Exception { + super.comparisonTest03(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest04() throws java.lang.Exception { + super.comparisonTest04(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest05() throws java.lang.Exception { + super.comparisonTest05(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest06() throws java.lang.Exception { + super.comparisonTest06(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest07() throws java.lang.Exception { + super.comparisonTest07(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest08() throws java.lang.Exception { + super.comparisonTest08(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest09() throws java.lang.Exception { + super.comparisonTest09(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest10() throws java.lang.Exception { + super.comparisonTest10(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest11() throws java.lang.Exception { + super.comparisonTest11(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest12() throws java.lang.Exception { + super.comparisonTest12(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest13() throws java.lang.Exception { + super.comparisonTest13(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void operatorTest2() throws java.lang.Exception { + super.operatorTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void operatorTest3() throws java.lang.Exception { + super.operatorTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest2() throws java.lang.Exception { + super.betweenTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest3() throws java.lang.Exception { + super.betweenTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest4() throws java.lang.Exception { + super.betweenTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest5() throws java.lang.Exception { + super.betweenTest5(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest6() throws java.lang.Exception { + super.betweenTest6(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest7() throws java.lang.Exception { + super.betweenTest7(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest2() throws java.lang.Exception { + super.inTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest3() throws java.lang.Exception { + super.inTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest4() throws java.lang.Exception { + super.inTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest5() throws java.lang.Exception { + super.inTest5(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest6() throws java.lang.Exception { + super.inTest6(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest7() throws java.lang.Exception { + super.inTest7(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest8() throws java.lang.Exception { + super.inTest8(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest02() throws java.lang.Exception { + super.likeTest02(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest03() throws java.lang.Exception { + super.likeTest03(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest04() throws java.lang.Exception { + super.likeTest04(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest05() throws java.lang.Exception { + super.likeTest05(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest06() throws java.lang.Exception { + super.likeTest06(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest07() throws java.lang.Exception { + super.likeTest07(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest08() throws java.lang.Exception { + super.likeTest08(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest09() throws java.lang.Exception { + super.likeTest09(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest10() throws java.lang.Exception { + super.likeTest10(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest11() throws java.lang.Exception { + super.likeTest11(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest12() throws java.lang.Exception { + super.likeTest12(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest13() throws java.lang.Exception { + super.likeTest13(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest14() throws java.lang.Exception { + super.likeTest14(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest15() throws java.lang.Exception { + super.likeTest15(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest16() throws java.lang.Exception { + super.likeTest16(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest17() throws java.lang.Exception { + super.likeTest17(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest18() throws java.lang.Exception { + super.likeTest18(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest19() throws java.lang.Exception { + super.likeTest19(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest20() throws java.lang.Exception { + super.likeTest20(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest21() throws java.lang.Exception { + super.likeTest21(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isNullTest2() throws java.lang.Exception { + super.isNullTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isNullTest3() throws java.lang.Exception { + super.isNullTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isNullTest4() throws java.lang.Exception { + super.isNullTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void precedenceTest2() throws java.lang.Exception { + super.precedenceTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void precedenceTest3() throws java.lang.Exception { + super.precedenceTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void precedenceTest4() throws java.lang.Exception { + super.precedenceTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void precedenceTest5() throws java.lang.Exception { + super.precedenceTest5(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest02() throws java.lang.Exception { + super.nullTest02(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest03() throws java.lang.Exception { + super.nullTest03(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest04() throws java.lang.Exception { + super.nullTest04(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest05() throws java.lang.Exception { + super.nullTest05(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest06() throws java.lang.Exception { + super.nullTest06(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest07() throws java.lang.Exception { + super.nullTest07(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest08() throws java.lang.Exception { + super.nullTest08(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest09() throws java.lang.Exception { + super.nullTest09(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest10() throws java.lang.Exception { + super.nullTest10(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java new file mode 100644 index 0000000000..86f227f7c8 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java @@ -0,0 +1,917 @@ +package com.sun.ts.tests.jms.core.selectorQueue; + +import com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorQueueTestsEjbTest extends com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests { + static final String VEHICLE_ARCHIVE = "selectorQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorQueue_appclient_vehicle: + selectorQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle: + selectorQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorQueue_jsp_vehicle: + selectorQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorQueue_servlet_vehicle: + selectorQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/selectorQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive selectorQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "selectorQueue_ejb_vehicle_client.jar"); + // The class files + selectorQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + selectorQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + selectorQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + selectorQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MsgSelectorQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(selectorQueue_ejb_vehicle_client, MsgSelectorQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive selectorQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "selectorQueue_ejb_vehicle_ejb.jar"); + // The class files + selectorQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + selectorQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + selectorQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(selectorQueue_ejb_vehicle_ejb, MsgSelectorQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive selectorQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorQueue_ejb_vehicle_ear.addAsModule(selectorQueue_ejb_vehicle_ejb); + selectorQueue_ejb_vehicle_ear.addAsModule(selectorQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); + if(earResURL != null) { + selectorQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + if(earResURL != null) { + selectorQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorQueue_ejb_vehicle_ear, MsgSelectorQueueTests.class, earResURL); + return selectorQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest02() throws java.lang.Exception { + super.selectorTest02(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest03() throws java.lang.Exception { + super.selectorTest03(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest04() throws java.lang.Exception { + super.selectorTest04(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest05() throws java.lang.Exception { + super.selectorTest05(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest06() throws java.lang.Exception { + super.selectorTest06(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest07() throws java.lang.Exception { + super.selectorTest07(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest08() throws java.lang.Exception { + super.selectorTest08(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest09() throws java.lang.Exception { + super.selectorTest09(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest11() throws java.lang.Exception { + super.selectorTest11(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest12() throws java.lang.Exception { + super.selectorTest12(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest02() throws java.lang.Exception { + super.identifierTest02(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest03() throws java.lang.Exception { + super.identifierTest03(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest04() throws java.lang.Exception { + super.identifierTest04(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest05() throws java.lang.Exception { + super.identifierTest05(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest06() throws java.lang.Exception { + super.identifierTest06(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest07() throws java.lang.Exception { + super.identifierTest07(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest08() throws java.lang.Exception { + super.identifierTest08(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest09() throws java.lang.Exception { + super.identifierTest09(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest10() throws java.lang.Exception { + super.identifierTest10(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest11() throws java.lang.Exception { + super.identifierTest11(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest12() throws java.lang.Exception { + super.identifierTest12(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest13() throws java.lang.Exception { + super.identifierTest13(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest14() throws java.lang.Exception { + super.identifierTest14(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void whitespaceTest2() throws java.lang.Exception { + super.whitespaceTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void whitespaceTest3() throws java.lang.Exception { + super.whitespaceTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void whitespaceTest4() throws java.lang.Exception { + super.whitespaceTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void expressionTest2() throws java.lang.Exception { + super.expressionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void expressionTest3() throws java.lang.Exception { + super.expressionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bracketingTest2() throws java.lang.Exception { + super.bracketingTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bracketingTest3() throws java.lang.Exception { + super.bracketingTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bracketingTest4() throws java.lang.Exception { + super.bracketingTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest02() throws java.lang.Exception { + super.comparisonTest02(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest03() throws java.lang.Exception { + super.comparisonTest03(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest04() throws java.lang.Exception { + super.comparisonTest04(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest05() throws java.lang.Exception { + super.comparisonTest05(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest06() throws java.lang.Exception { + super.comparisonTest06(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest07() throws java.lang.Exception { + super.comparisonTest07(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest08() throws java.lang.Exception { + super.comparisonTest08(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest09() throws java.lang.Exception { + super.comparisonTest09(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest10() throws java.lang.Exception { + super.comparisonTest10(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest11() throws java.lang.Exception { + super.comparisonTest11(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest12() throws java.lang.Exception { + super.comparisonTest12(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest13() throws java.lang.Exception { + super.comparisonTest13(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void operatorTest2() throws java.lang.Exception { + super.operatorTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void operatorTest3() throws java.lang.Exception { + super.operatorTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest2() throws java.lang.Exception { + super.betweenTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest3() throws java.lang.Exception { + super.betweenTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest4() throws java.lang.Exception { + super.betweenTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest5() throws java.lang.Exception { + super.betweenTest5(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest6() throws java.lang.Exception { + super.betweenTest6(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest7() throws java.lang.Exception { + super.betweenTest7(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest2() throws java.lang.Exception { + super.inTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest3() throws java.lang.Exception { + super.inTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest4() throws java.lang.Exception { + super.inTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest5() throws java.lang.Exception { + super.inTest5(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest6() throws java.lang.Exception { + super.inTest6(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest7() throws java.lang.Exception { + super.inTest7(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest8() throws java.lang.Exception { + super.inTest8(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest02() throws java.lang.Exception { + super.likeTest02(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest03() throws java.lang.Exception { + super.likeTest03(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest04() throws java.lang.Exception { + super.likeTest04(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest05() throws java.lang.Exception { + super.likeTest05(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest06() throws java.lang.Exception { + super.likeTest06(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest07() throws java.lang.Exception { + super.likeTest07(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest08() throws java.lang.Exception { + super.likeTest08(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest09() throws java.lang.Exception { + super.likeTest09(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest10() throws java.lang.Exception { + super.likeTest10(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest11() throws java.lang.Exception { + super.likeTest11(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest12() throws java.lang.Exception { + super.likeTest12(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest13() throws java.lang.Exception { + super.likeTest13(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest14() throws java.lang.Exception { + super.likeTest14(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest15() throws java.lang.Exception { + super.likeTest15(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest16() throws java.lang.Exception { + super.likeTest16(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest17() throws java.lang.Exception { + super.likeTest17(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest18() throws java.lang.Exception { + super.likeTest18(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest19() throws java.lang.Exception { + super.likeTest19(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest20() throws java.lang.Exception { + super.likeTest20(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest21() throws java.lang.Exception { + super.likeTest21(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isNullTest2() throws java.lang.Exception { + super.isNullTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isNullTest3() throws java.lang.Exception { + super.isNullTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isNullTest4() throws java.lang.Exception { + super.isNullTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void precedenceTest2() throws java.lang.Exception { + super.precedenceTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void precedenceTest3() throws java.lang.Exception { + super.precedenceTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void precedenceTest4() throws java.lang.Exception { + super.precedenceTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void precedenceTest5() throws java.lang.Exception { + super.precedenceTest5(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest02() throws java.lang.Exception { + super.nullTest02(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest03() throws java.lang.Exception { + super.nullTest03(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest04() throws java.lang.Exception { + super.nullTest04(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest05() throws java.lang.Exception { + super.nullTest05(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest06() throws java.lang.Exception { + super.nullTest06(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest07() throws java.lang.Exception { + super.nullTest07(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest08() throws java.lang.Exception { + super.nullTest08(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest09() throws java.lang.Exception { + super.nullTest09(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest10() throws java.lang.Exception { + super.nullTest10(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java new file mode 100644 index 0000000000..3345939fcb --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java @@ -0,0 +1,900 @@ +package com.sun.ts.tests.jms.core.selectorQueue; + +import com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorQueueTestsJspTest extends com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests { + static final String VEHICLE_ARCHIVE = "selectorQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorQueue_appclient_vehicle: + selectorQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle: + selectorQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorQueue_jsp_vehicle: + selectorQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorQueue_servlet_vehicle: + selectorQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/selectorQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive selectorQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "selectorQueue_jsp_vehicle_web.war"); + // The class files + selectorQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + selectorQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + selectorQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(selectorQueue_jsp_vehicle_web, MsgSelectorQueueTests.class, warResURL); + + // Ear + EnterpriseArchive selectorQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorQueue_jsp_vehicle_ear.addAsModule(selectorQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); + if(earResURL != null) { + selectorQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + if(earResURL != null) { + selectorQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorQueue_jsp_vehicle_ear, MsgSelectorQueueTests.class, earResURL); + return selectorQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest02() throws java.lang.Exception { + super.selectorTest02(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest03() throws java.lang.Exception { + super.selectorTest03(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest04() throws java.lang.Exception { + super.selectorTest04(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest05() throws java.lang.Exception { + super.selectorTest05(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest06() throws java.lang.Exception { + super.selectorTest06(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest07() throws java.lang.Exception { + super.selectorTest07(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest08() throws java.lang.Exception { + super.selectorTest08(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest09() throws java.lang.Exception { + super.selectorTest09(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest11() throws java.lang.Exception { + super.selectorTest11(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest12() throws java.lang.Exception { + super.selectorTest12(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest02() throws java.lang.Exception { + super.identifierTest02(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest03() throws java.lang.Exception { + super.identifierTest03(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest04() throws java.lang.Exception { + super.identifierTest04(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest05() throws java.lang.Exception { + super.identifierTest05(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest06() throws java.lang.Exception { + super.identifierTest06(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest07() throws java.lang.Exception { + super.identifierTest07(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest08() throws java.lang.Exception { + super.identifierTest08(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest09() throws java.lang.Exception { + super.identifierTest09(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest10() throws java.lang.Exception { + super.identifierTest10(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest11() throws java.lang.Exception { + super.identifierTest11(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest12() throws java.lang.Exception { + super.identifierTest12(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest13() throws java.lang.Exception { + super.identifierTest13(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest14() throws java.lang.Exception { + super.identifierTest14(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void whitespaceTest2() throws java.lang.Exception { + super.whitespaceTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void whitespaceTest3() throws java.lang.Exception { + super.whitespaceTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void whitespaceTest4() throws java.lang.Exception { + super.whitespaceTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void expressionTest2() throws java.lang.Exception { + super.expressionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void expressionTest3() throws java.lang.Exception { + super.expressionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bracketingTest2() throws java.lang.Exception { + super.bracketingTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bracketingTest3() throws java.lang.Exception { + super.bracketingTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bracketingTest4() throws java.lang.Exception { + super.bracketingTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest02() throws java.lang.Exception { + super.comparisonTest02(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest03() throws java.lang.Exception { + super.comparisonTest03(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest04() throws java.lang.Exception { + super.comparisonTest04(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest05() throws java.lang.Exception { + super.comparisonTest05(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest06() throws java.lang.Exception { + super.comparisonTest06(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest07() throws java.lang.Exception { + super.comparisonTest07(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest08() throws java.lang.Exception { + super.comparisonTest08(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest09() throws java.lang.Exception { + super.comparisonTest09(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest10() throws java.lang.Exception { + super.comparisonTest10(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest11() throws java.lang.Exception { + super.comparisonTest11(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest12() throws java.lang.Exception { + super.comparisonTest12(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest13() throws java.lang.Exception { + super.comparisonTest13(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void operatorTest2() throws java.lang.Exception { + super.operatorTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void operatorTest3() throws java.lang.Exception { + super.operatorTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest2() throws java.lang.Exception { + super.betweenTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest3() throws java.lang.Exception { + super.betweenTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest4() throws java.lang.Exception { + super.betweenTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest5() throws java.lang.Exception { + super.betweenTest5(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest6() throws java.lang.Exception { + super.betweenTest6(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest7() throws java.lang.Exception { + super.betweenTest7(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest2() throws java.lang.Exception { + super.inTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest3() throws java.lang.Exception { + super.inTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest4() throws java.lang.Exception { + super.inTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest5() throws java.lang.Exception { + super.inTest5(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest6() throws java.lang.Exception { + super.inTest6(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest7() throws java.lang.Exception { + super.inTest7(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest8() throws java.lang.Exception { + super.inTest8(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest02() throws java.lang.Exception { + super.likeTest02(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest03() throws java.lang.Exception { + super.likeTest03(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest04() throws java.lang.Exception { + super.likeTest04(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest05() throws java.lang.Exception { + super.likeTest05(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest06() throws java.lang.Exception { + super.likeTest06(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest07() throws java.lang.Exception { + super.likeTest07(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest08() throws java.lang.Exception { + super.likeTest08(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest09() throws java.lang.Exception { + super.likeTest09(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest10() throws java.lang.Exception { + super.likeTest10(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest11() throws java.lang.Exception { + super.likeTest11(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest12() throws java.lang.Exception { + super.likeTest12(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest13() throws java.lang.Exception { + super.likeTest13(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest14() throws java.lang.Exception { + super.likeTest14(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest15() throws java.lang.Exception { + super.likeTest15(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest16() throws java.lang.Exception { + super.likeTest16(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest17() throws java.lang.Exception { + super.likeTest17(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest18() throws java.lang.Exception { + super.likeTest18(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest19() throws java.lang.Exception { + super.likeTest19(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest20() throws java.lang.Exception { + super.likeTest20(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest21() throws java.lang.Exception { + super.likeTest21(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isNullTest2() throws java.lang.Exception { + super.isNullTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isNullTest3() throws java.lang.Exception { + super.isNullTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isNullTest4() throws java.lang.Exception { + super.isNullTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void precedenceTest2() throws java.lang.Exception { + super.precedenceTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void precedenceTest3() throws java.lang.Exception { + super.precedenceTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void precedenceTest4() throws java.lang.Exception { + super.precedenceTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void precedenceTest5() throws java.lang.Exception { + super.precedenceTest5(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest02() throws java.lang.Exception { + super.nullTest02(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest03() throws java.lang.Exception { + super.nullTest03(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest04() throws java.lang.Exception { + super.nullTest04(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest05() throws java.lang.Exception { + super.nullTest05(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest06() throws java.lang.Exception { + super.nullTest06(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest07() throws java.lang.Exception { + super.nullTest07(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest08() throws java.lang.Exception { + super.nullTest08(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest09() throws java.lang.Exception { + super.nullTest09(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest10() throws java.lang.Exception { + super.nullTest10(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java new file mode 100644 index 0000000000..57913beebe --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java @@ -0,0 +1,893 @@ +package com.sun.ts.tests.jms.core.selectorQueue; + +import com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorQueueTestsServletTest extends com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests { + static final String VEHICLE_ARCHIVE = "selectorQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorQueue_appclient_vehicle: + selectorQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle: + selectorQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorQueue_jsp_vehicle: + selectorQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorQueue_servlet_vehicle: + selectorQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/selectorQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive selectorQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "selectorQueue_servlet_vehicle_web.war"); + // The class files + selectorQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.selectorQueue.MsgSelectorQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + selectorQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + selectorQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + selectorQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + selectorQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(selectorQueue_servlet_vehicle_web, MsgSelectorQueueTests.class, warResURL); + + // Ear + EnterpriseArchive selectorQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorQueue_servlet_vehicle_ear.addAsModule(selectorQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); + if(earResURL != null) { + selectorQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + if(earResURL != null) { + selectorQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorQueue_servlet_vehicle_ear, MsgSelectorQueueTests.class, earResURL); + return selectorQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest02() throws java.lang.Exception { + super.selectorTest02(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest03() throws java.lang.Exception { + super.selectorTest03(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest04() throws java.lang.Exception { + super.selectorTest04(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest05() throws java.lang.Exception { + super.selectorTest05(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest06() throws java.lang.Exception { + super.selectorTest06(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest07() throws java.lang.Exception { + super.selectorTest07(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest08() throws java.lang.Exception { + super.selectorTest08(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest09() throws java.lang.Exception { + super.selectorTest09(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest11() throws java.lang.Exception { + super.selectorTest11(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest12() throws java.lang.Exception { + super.selectorTest12(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest02() throws java.lang.Exception { + super.identifierTest02(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest03() throws java.lang.Exception { + super.identifierTest03(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest04() throws java.lang.Exception { + super.identifierTest04(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest05() throws java.lang.Exception { + super.identifierTest05(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest06() throws java.lang.Exception { + super.identifierTest06(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest07() throws java.lang.Exception { + super.identifierTest07(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest08() throws java.lang.Exception { + super.identifierTest08(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest09() throws java.lang.Exception { + super.identifierTest09(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest10() throws java.lang.Exception { + super.identifierTest10(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest11() throws java.lang.Exception { + super.identifierTest11(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest12() throws java.lang.Exception { + super.identifierTest12(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest13() throws java.lang.Exception { + super.identifierTest13(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest14() throws java.lang.Exception { + super.identifierTest14(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void whitespaceTest2() throws java.lang.Exception { + super.whitespaceTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void whitespaceTest3() throws java.lang.Exception { + super.whitespaceTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void whitespaceTest4() throws java.lang.Exception { + super.whitespaceTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void expressionTest2() throws java.lang.Exception { + super.expressionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void expressionTest3() throws java.lang.Exception { + super.expressionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bracketingTest2() throws java.lang.Exception { + super.bracketingTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bracketingTest3() throws java.lang.Exception { + super.bracketingTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bracketingTest4() throws java.lang.Exception { + super.bracketingTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest02() throws java.lang.Exception { + super.comparisonTest02(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest03() throws java.lang.Exception { + super.comparisonTest03(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest04() throws java.lang.Exception { + super.comparisonTest04(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest05() throws java.lang.Exception { + super.comparisonTest05(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest06() throws java.lang.Exception { + super.comparisonTest06(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest07() throws java.lang.Exception { + super.comparisonTest07(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest08() throws java.lang.Exception { + super.comparisonTest08(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest09() throws java.lang.Exception { + super.comparisonTest09(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest10() throws java.lang.Exception { + super.comparisonTest10(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest11() throws java.lang.Exception { + super.comparisonTest11(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest12() throws java.lang.Exception { + super.comparisonTest12(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest13() throws java.lang.Exception { + super.comparisonTest13(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void operatorTest2() throws java.lang.Exception { + super.operatorTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void operatorTest3() throws java.lang.Exception { + super.operatorTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest2() throws java.lang.Exception { + super.betweenTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest3() throws java.lang.Exception { + super.betweenTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest4() throws java.lang.Exception { + super.betweenTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest5() throws java.lang.Exception { + super.betweenTest5(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest6() throws java.lang.Exception { + super.betweenTest6(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest7() throws java.lang.Exception { + super.betweenTest7(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest2() throws java.lang.Exception { + super.inTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest3() throws java.lang.Exception { + super.inTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest4() throws java.lang.Exception { + super.inTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest5() throws java.lang.Exception { + super.inTest5(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest6() throws java.lang.Exception { + super.inTest6(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest7() throws java.lang.Exception { + super.inTest7(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest8() throws java.lang.Exception { + super.inTest8(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest02() throws java.lang.Exception { + super.likeTest02(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest03() throws java.lang.Exception { + super.likeTest03(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest04() throws java.lang.Exception { + super.likeTest04(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest05() throws java.lang.Exception { + super.likeTest05(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest06() throws java.lang.Exception { + super.likeTest06(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest07() throws java.lang.Exception { + super.likeTest07(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest08() throws java.lang.Exception { + super.likeTest08(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest09() throws java.lang.Exception { + super.likeTest09(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest10() throws java.lang.Exception { + super.likeTest10(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest11() throws java.lang.Exception { + super.likeTest11(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest12() throws java.lang.Exception { + super.likeTest12(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest13() throws java.lang.Exception { + super.likeTest13(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest14() throws java.lang.Exception { + super.likeTest14(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest15() throws java.lang.Exception { + super.likeTest15(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest16() throws java.lang.Exception { + super.likeTest16(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest17() throws java.lang.Exception { + super.likeTest17(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest18() throws java.lang.Exception { + super.likeTest18(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest19() throws java.lang.Exception { + super.likeTest19(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest20() throws java.lang.Exception { + super.likeTest20(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest21() throws java.lang.Exception { + super.likeTest21(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isNullTest2() throws java.lang.Exception { + super.isNullTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isNullTest3() throws java.lang.Exception { + super.isNullTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isNullTest4() throws java.lang.Exception { + super.isNullTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void precedenceTest2() throws java.lang.Exception { + super.precedenceTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void precedenceTest3() throws java.lang.Exception { + super.precedenceTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void precedenceTest4() throws java.lang.Exception { + super.precedenceTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void precedenceTest5() throws java.lang.Exception { + super.precedenceTest5(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest02() throws java.lang.Exception { + super.nullTest02(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest03() throws java.lang.Exception { + super.nullTest03(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest04() throws java.lang.Exception { + super.nullTest04(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest05() throws java.lang.Exception { + super.nullTest05(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest06() throws java.lang.Exception { + super.nullTest06(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest07() throws java.lang.Exception { + super.nullTest07(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest08() throws java.lang.Exception { + super.nullTest08(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest09() throws java.lang.Exception { + super.nullTest09(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest10() throws java.lang.Exception { + super.nullTest10(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java new file mode 100644 index 0000000000..843124c9c1 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java @@ -0,0 +1,244 @@ +package com.sun.ts.tests.jms.core.selectorTopic; + +import com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests { + static final String VEHICLE_ARCHIVE = "selectorTopic_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorTopic_appclient_vehicle: + selectorTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle: + selectorTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorTopic_jsp_vehicle: + selectorTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorTopic_servlet_vehicle: + selectorTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/selectorTopic/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive selectorTopic_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "selectorTopic_appclient_vehicle_client.jar"); + // The class files + selectorTopic_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + selectorTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MsgSelectorTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + selectorTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + selectorTopic_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MsgSelectorTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(selectorTopic_appclient_vehicle_client, MsgSelectorTopicTests.class, resURL); + + // Ear + EnterpriseArchive selectorTopic_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorTopic_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorTopic_appclient_vehicle_ear.addAsModule(selectorTopic_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); + if(earResURL != null) { + selectorTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + if(earResURL != null) { + selectorTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorTopic_appclient_vehicle_ear, MsgSelectorTopicTests.class, earResURL); + return selectorTopic_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void emptyTest() throws java.lang.Exception { + super.emptyTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableTopicEmptyStringSelTest() throws java.lang.Exception { + super.durableTopicEmptyStringSelTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableTopicNullSelTest() throws java.lang.Exception { + super.durableTopicNullSelTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java new file mode 100644 index 0000000000..b8ce709cb9 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java @@ -0,0 +1,280 @@ +package com.sun.ts.tests.jms.core.selectorTopic; + +import com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorTopicTestsEjbTest extends com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests { + static final String VEHICLE_ARCHIVE = "selectorTopic_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorTopic_appclient_vehicle: + selectorTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle: + selectorTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorTopic_jsp_vehicle: + selectorTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorTopic_servlet_vehicle: + selectorTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/selectorTopic/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive selectorTopic_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "selectorTopic_ejb_vehicle_client.jar"); + // The class files + selectorTopic_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + selectorTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MsgSelectorTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + selectorTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + selectorTopic_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + MsgSelectorTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(selectorTopic_ejb_vehicle_client, MsgSelectorTopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive selectorTopic_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "selectorTopic_ejb_vehicle_ejb.jar"); + // The class files + selectorTopic_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MsgSelectorTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + selectorTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MsgSelectorTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + selectorTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(selectorTopic_ejb_vehicle_ejb, MsgSelectorTopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive selectorTopic_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorTopic_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorTopic_ejb_vehicle_ear.addAsModule(selectorTopic_ejb_vehicle_ejb); + selectorTopic_ejb_vehicle_ear.addAsModule(selectorTopic_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); + if(earResURL != null) { + selectorTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + if(earResURL != null) { + selectorTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorTopic_ejb_vehicle_ear, MsgSelectorTopicTests.class, earResURL); + return selectorTopic_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void emptyTest() throws java.lang.Exception { + super.emptyTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableTopicEmptyStringSelTest() throws java.lang.Exception { + super.durableTopicEmptyStringSelTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableTopicNullSelTest() throws java.lang.Exception { + super.durableTopicNullSelTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java new file mode 100644 index 0000000000..6d4a494090 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java @@ -0,0 +1,263 @@ +package com.sun.ts.tests.jms.core.selectorTopic; + +import com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorTopicTestsJspTest extends com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests { + static final String VEHICLE_ARCHIVE = "selectorTopic_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorTopic_appclient_vehicle: + selectorTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle: + selectorTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorTopic_jsp_vehicle: + selectorTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorTopic_servlet_vehicle: + selectorTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/selectorTopic/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive selectorTopic_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "selectorTopic_jsp_vehicle_web.war"); + // The class files + selectorTopic_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + selectorTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MsgSelectorTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + selectorTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + selectorTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/jsp_vehicle_web.xml"); + if(warResURL != null) { + selectorTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + selectorTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + selectorTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(selectorTopic_jsp_vehicle_web, MsgSelectorTopicTests.class, warResURL); + + // Ear + EnterpriseArchive selectorTopic_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorTopic_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorTopic_jsp_vehicle_ear.addAsModule(selectorTopic_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); + if(earResURL != null) { + selectorTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + if(earResURL != null) { + selectorTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorTopic_jsp_vehicle_ear, MsgSelectorTopicTests.class, earResURL); + return selectorTopic_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void emptyTest() throws java.lang.Exception { + super.emptyTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableTopicEmptyStringSelTest() throws java.lang.Exception { + super.durableTopicEmptyStringSelTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableTopicNullSelTest() throws java.lang.Exception { + super.durableTopicNullSelTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java new file mode 100644 index 0000000000..22b4c605b9 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java @@ -0,0 +1,256 @@ +package com.sun.ts.tests.jms.core.selectorTopic; + +import com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class MsgSelectorTopicTestsServletTest extends com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests { + static final String VEHICLE_ARCHIVE = "selectorTopic_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + selectorTopic_appclient_vehicle: + selectorTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle: + selectorTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + selectorTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + selectorTopic_jsp_vehicle: + selectorTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + selectorTopic_servlet_vehicle: + selectorTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/selectorTopic/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive selectorTopic_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "selectorTopic_servlet_vehicle_web.war"); + // The class files + selectorTopic_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + selectorTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = MsgSelectorTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + selectorTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + selectorTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/servlet_vehicle_web.xml"); + if(warResURL != null) { + selectorTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(selectorTopic_servlet_vehicle_web, MsgSelectorTopicTests.class, warResURL); + + // Ear + EnterpriseArchive selectorTopic_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "selectorTopic_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + selectorTopic_servlet_vehicle_ear.addAsModule(selectorTopic_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); + if(earResURL != null) { + selectorTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + if(earResURL != null) { + selectorTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(selectorTopic_servlet_vehicle_ear, MsgSelectorTopicTests.class, earResURL); + return selectorTopic_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorTest01() throws java.lang.Exception { + super.selectorTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void identifierTest01() throws java.lang.Exception { + super.identifierTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void whitespaceTest1() throws java.lang.Exception { + super.whitespaceTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void expressionTest1() throws java.lang.Exception { + super.expressionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void bracketingTest1() throws java.lang.Exception { + super.bracketingTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void comparisonTest01() throws java.lang.Exception { + super.comparisonTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void operatorTest1() throws java.lang.Exception { + super.operatorTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void betweenTest1() throws java.lang.Exception { + super.betweenTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inTest1() throws java.lang.Exception { + super.inTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void likeTest01() throws java.lang.Exception { + super.likeTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isNullTest1() throws java.lang.Exception { + super.isNullTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void caseTest1() throws java.lang.Exception { + super.caseTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void precedenceTest1() throws java.lang.Exception { + super.precedenceTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest01() throws java.lang.Exception { + super.nullTest01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void nullTest11() throws java.lang.Exception { + super.nullTest11(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void emptyTest() throws java.lang.Exception { + super.emptyTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableTopicEmptyStringSelTest() throws java.lang.Exception { + super.durableTopicEmptyStringSelTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableTopicNullSelTest() throws java.lang.Exception { + super.durableTopicNullSelTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java new file mode 100644 index 0000000000..b06a7c15bc --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java @@ -0,0 +1,174 @@ +package com.sun.ts.tests.jms.core.sessiontests; + +import com.sun.ts.tests.jms.core.sessiontests.SessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class SessionTestsAppclientTest extends com.sun.ts.tests.jms.core.sessiontests.SessionTests { + static final String VEHICLE_ARCHIVE = "sessiontests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/sessiontests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive sessiontests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "sessiontests_appclient_vehicle_client.jar"); + // The class files + sessiontests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.core.sessiontests.SessionTests.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + sessiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = SessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + sessiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + sessiontests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + SessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(sessiontests_appclient_vehicle_client, SessionTests.class, resURL); + + // Ear + EnterpriseArchive sessiontests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_appclient_vehicle_ear.addAsModule(sessiontests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); + if(earResURL != null) { + sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_appclient_vehicle_ear, SessionTests.class, earResURL); + return sessiontests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void SimpleSendAndReceiveQ() throws java.lang.Exception { + super.SimpleSendAndReceiveQ(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void SimpleSendAndReceiveT() throws java.lang.Exception { + super.SimpleSendAndReceiveT(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void selectorAndBrowserTests() throws java.lang.Exception { + super.selectorAndBrowserTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void SubscriberTests() throws java.lang.Exception { + super.SubscriberTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void IllegalStateTestQ() throws java.lang.Exception { + super.IllegalStateTestQ(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void ackTests() throws java.lang.Exception { + super.ackTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void InvalidDestinationTests() throws java.lang.Exception { + super.InvalidDestinationTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void InvalidSelectorTests() throws java.lang.Exception { + super.InvalidSelectorTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java new file mode 100644 index 0000000000..cdcd909543 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java @@ -0,0 +1,210 @@ +package com.sun.ts.tests.jms.core.sessiontests; + +import com.sun.ts.tests.jms.core.sessiontests.SessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class SessionTestsEjbTest extends com.sun.ts.tests.jms.core.sessiontests.SessionTests { + static final String VEHICLE_ARCHIVE = "sessiontests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/sessiontests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive sessiontests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "sessiontests_ejb_vehicle_client.jar"); + // The class files + sessiontests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + sessiontests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = SessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + sessiontests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + sessiontests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + SessionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(sessiontests_ejb_vehicle_client, SessionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive sessiontests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "sessiontests_ejb_vehicle_ejb.jar"); + // The class files + sessiontests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.core.sessiontests.SessionTests.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = SessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + sessiontests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = SessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + sessiontests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(sessiontests_ejb_vehicle_ejb, SessionTests.class, ejbResURL); + + // Ear + EnterpriseArchive sessiontests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_ejb_vehicle_ear.addAsModule(sessiontests_ejb_vehicle_ejb); + sessiontests_ejb_vehicle_ear.addAsModule(sessiontests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); + if(earResURL != null) { + sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_ejb_vehicle_ear, SessionTests.class, earResURL); + return sessiontests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void SimpleSendAndReceiveQ() throws java.lang.Exception { + super.SimpleSendAndReceiveQ(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void SimpleSendAndReceiveT() throws java.lang.Exception { + super.SimpleSendAndReceiveT(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void selectorAndBrowserTests() throws java.lang.Exception { + super.selectorAndBrowserTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void SubscriberTests() throws java.lang.Exception { + super.SubscriberTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void IllegalStateTestQ() throws java.lang.Exception { + super.IllegalStateTestQ(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void ackTests() throws java.lang.Exception { + super.ackTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void InvalidDestinationTests() throws java.lang.Exception { + super.InvalidDestinationTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void InvalidSelectorTests() throws java.lang.Exception { + super.InvalidSelectorTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java new file mode 100644 index 0000000000..395e4983c6 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java @@ -0,0 +1,193 @@ +package com.sun.ts.tests.jms.core.sessiontests; + +import com.sun.ts.tests.jms.core.sessiontests.SessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class SessionTestsJspTest extends com.sun.ts.tests.jms.core.sessiontests.SessionTests { + static final String VEHICLE_ARCHIVE = "sessiontests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/sessiontests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive sessiontests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "sessiontests_jsp_vehicle_web.war"); + // The class files + sessiontests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.core.sessiontests.SessionTests.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = SessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/jsp_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(sessiontests_jsp_vehicle_web, SessionTests.class, warResURL); + + // Ear + EnterpriseArchive sessiontests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_jsp_vehicle_ear.addAsModule(sessiontests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); + if(earResURL != null) { + sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_jsp_vehicle_ear, SessionTests.class, earResURL); + return sessiontests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void SimpleSendAndReceiveQ() throws java.lang.Exception { + super.SimpleSendAndReceiveQ(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void SimpleSendAndReceiveT() throws java.lang.Exception { + super.SimpleSendAndReceiveT(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void selectorAndBrowserTests() throws java.lang.Exception { + super.selectorAndBrowserTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void SubscriberTests() throws java.lang.Exception { + super.SubscriberTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void IllegalStateTestQ() throws java.lang.Exception { + super.IllegalStateTestQ(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void ackTests() throws java.lang.Exception { + super.ackTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void InvalidDestinationTests() throws java.lang.Exception { + super.InvalidDestinationTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void InvalidSelectorTests() throws java.lang.Exception { + super.InvalidSelectorTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java new file mode 100644 index 0000000000..1bb90582ec --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java @@ -0,0 +1,186 @@ +package com.sun.ts.tests.jms.core.sessiontests; + +import com.sun.ts.tests.jms.core.sessiontests.SessionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class SessionTestsServletTest extends com.sun.ts.tests.jms.core.sessiontests.SessionTests { + static final String VEHICLE_ARCHIVE = "sessiontests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/sessiontests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive sessiontests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "sessiontests_servlet_vehicle_web.war"); + // The class files + sessiontests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jms.core.sessiontests.SessionTests.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = SessionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = SessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/servlet_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(sessiontests_servlet_vehicle_web, SessionTests.class, warResURL); + + // Ear + EnterpriseArchive sessiontests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_servlet_vehicle_ear.addAsModule(sessiontests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); + if(earResURL != null) { + sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_servlet_vehicle_ear, SessionTests.class, earResURL); + return sessiontests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void SimpleSendAndReceiveQ() throws java.lang.Exception { + super.SimpleSendAndReceiveQ(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void SimpleSendAndReceiveT() throws java.lang.Exception { + super.SimpleSendAndReceiveT(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void selectorAndBrowserTests() throws java.lang.Exception { + super.selectorAndBrowserTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void SubscriberTests() throws java.lang.Exception { + super.SubscriberTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void IllegalStateTestQ() throws java.lang.Exception { + super.IllegalStateTestQ(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void ackTests() throws java.lang.Exception { + super.ackTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void InvalidDestinationTests() throws java.lang.Exception { + super.InvalidDestinationTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void InvalidSelectorTests() throws java.lang.Exception { + super.InvalidSelectorTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java new file mode 100644 index 0000000000..2f1e657138 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java @@ -0,0 +1,216 @@ +package com.sun.ts.tests.jms.core.streamMsgQueue; + +import com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgQueueTestsAppclientTest extends com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests { + static final String VEHICLE_ARCHIVE = "streamMsgQueue_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgQueue_appclient_vehicle: + streamMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle: + streamMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgQueue_jsp_vehicle: + streamMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgQueue_servlet_vehicle: + streamMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/streamMsgQueue/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive streamMsgQueue_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "streamMsgQueue_appclient_vehicle_client.jar"); + // The class files + streamMsgQueue_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + streamMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = StreamMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + streamMsgQueue_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + streamMsgQueue_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + StreamMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(streamMsgQueue_appclient_vehicle_client, StreamMsgQueueTests.class, resURL); + + // Ear + EnterpriseArchive streamMsgQueue_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgQueue_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgQueue_appclient_vehicle_ear.addAsModule(streamMsgQueue_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); + if(earResURL != null) { + streamMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgQueue_appclient_vehicle_ear, StreamMsgQueueTests.class, earResURL); + return streamMsgQueue_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsByte() throws java.lang.Exception { + super.streamMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsShort() throws java.lang.Exception { + super.streamMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsInt() throws java.lang.Exception { + super.streamMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsLong() throws java.lang.Exception { + super.streamMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsFloat() throws java.lang.Exception { + super.streamMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsDouble() throws java.lang.Exception { + super.streamMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsString() throws java.lang.Exception { + super.streamMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsChar() throws java.lang.Exception { + super.streamMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsBytes() throws java.lang.Exception { + super.streamMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageQTestsFullMsg() throws java.lang.Exception { + super.streamMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageQTestNull() throws java.lang.Exception { + super.streamMessageQTestNull(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java new file mode 100644 index 0000000000..25cf22cb1d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java @@ -0,0 +1,254 @@ +package com.sun.ts.tests.jms.core.streamMsgQueue; + +import com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgQueueTestsEjbTest extends com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests { + static final String VEHICLE_ARCHIVE = "streamMsgQueue_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgQueue_appclient_vehicle: + streamMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle: + streamMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgQueue_jsp_vehicle: + streamMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgQueue_servlet_vehicle: + streamMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/streamMsgQueue/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive streamMsgQueue_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "streamMsgQueue_ejb_vehicle_client.jar"); + // The class files + streamMsgQueue_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + streamMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = StreamMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + streamMsgQueue_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + streamMsgQueue_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + StreamMsgQueueTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(streamMsgQueue_ejb_vehicle_client, StreamMsgQueueTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive streamMsgQueue_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "streamMsgQueue_ejb_vehicle_ejb.jar"); + // The class files + streamMsgQueue_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = StreamMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + streamMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = StreamMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + streamMsgQueue_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(streamMsgQueue_ejb_vehicle_ejb, StreamMsgQueueTests.class, ejbResURL); + + // Ear + EnterpriseArchive streamMsgQueue_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgQueue_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgQueue_ejb_vehicle_ear.addAsModule(streamMsgQueue_ejb_vehicle_ejb); + streamMsgQueue_ejb_vehicle_ear.addAsModule(streamMsgQueue_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); + if(earResURL != null) { + streamMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgQueue_ejb_vehicle_ear, StreamMsgQueueTests.class, earResURL); + return streamMsgQueue_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsByte() throws java.lang.Exception { + super.streamMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsShort() throws java.lang.Exception { + super.streamMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsInt() throws java.lang.Exception { + super.streamMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsLong() throws java.lang.Exception { + super.streamMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsFloat() throws java.lang.Exception { + super.streamMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsDouble() throws java.lang.Exception { + super.streamMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsString() throws java.lang.Exception { + super.streamMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsChar() throws java.lang.Exception { + super.streamMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsBytes() throws java.lang.Exception { + super.streamMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageQTestsFullMsg() throws java.lang.Exception { + super.streamMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageQTestNull() throws java.lang.Exception { + super.streamMessageQTestNull(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java new file mode 100644 index 0000000000..66973ae168 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java @@ -0,0 +1,236 @@ +package com.sun.ts.tests.jms.core.streamMsgQueue; + +import com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgQueueTestsJspTest extends com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests { + static final String VEHICLE_ARCHIVE = "streamMsgQueue_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgQueue_appclient_vehicle: + streamMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle: + streamMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgQueue_jsp_vehicle: + streamMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgQueue_servlet_vehicle: + streamMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/streamMsgQueue/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive streamMsgQueue_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "streamMsgQueue_jsp_vehicle_web.war"); + // The class files + streamMsgQueue_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + streamMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = StreamMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + streamMsgQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + streamMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/jsp_vehicle_web.xml"); + if(warResURL != null) { + streamMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + streamMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + streamMsgQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(streamMsgQueue_jsp_vehicle_web, StreamMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive streamMsgQueue_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgQueue_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgQueue_jsp_vehicle_ear.addAsModule(streamMsgQueue_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); + if(earResURL != null) { + streamMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgQueue_jsp_vehicle_ear, StreamMsgQueueTests.class, earResURL); + return streamMsgQueue_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsByte() throws java.lang.Exception { + super.streamMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsShort() throws java.lang.Exception { + super.streamMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsInt() throws java.lang.Exception { + super.streamMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsLong() throws java.lang.Exception { + super.streamMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsFloat() throws java.lang.Exception { + super.streamMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsDouble() throws java.lang.Exception { + super.streamMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsString() throws java.lang.Exception { + super.streamMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsChar() throws java.lang.Exception { + super.streamMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsBytes() throws java.lang.Exception { + super.streamMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageQTestsFullMsg() throws java.lang.Exception { + super.streamMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageQTestNull() throws java.lang.Exception { + super.streamMessageQTestNull(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java new file mode 100644 index 0000000000..efda78a2ad --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java @@ -0,0 +1,229 @@ +package com.sun.ts.tests.jms.core.streamMsgQueue; + +import com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgQueueTestsServletTest extends com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests { + static final String VEHICLE_ARCHIVE = "streamMsgQueue_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgQueue_appclient_vehicle: + streamMsgQueue_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle: + streamMsgQueue_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgQueue_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgQueue_jsp_vehicle: + streamMsgQueue_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgQueue_servlet_vehicle: + streamMsgQueue_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/streamMsgQueue/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive streamMsgQueue_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "streamMsgQueue_servlet_vehicle_web.war"); + // The class files + streamMsgQueue_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + streamMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = StreamMsgQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + streamMsgQueue_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + streamMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/servlet_vehicle_web.xml"); + if(warResURL != null) { + streamMsgQueue_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(streamMsgQueue_servlet_vehicle_web, StreamMsgQueueTests.class, warResURL); + + // Ear + EnterpriseArchive streamMsgQueue_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgQueue_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgQueue_servlet_vehicle_ear.addAsModule(streamMsgQueue_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); + if(earResURL != null) { + streamMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgQueue_servlet_vehicle_ear, StreamMsgQueueTests.class, earResURL); + return streamMsgQueue_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionQTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsByte() throws java.lang.Exception { + super.streamMessageConversionQTestsByte(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsShort() throws java.lang.Exception { + super.streamMessageConversionQTestsShort(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsInt() throws java.lang.Exception { + super.streamMessageConversionQTestsInt(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsLong() throws java.lang.Exception { + super.streamMessageConversionQTestsLong(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsFloat() throws java.lang.Exception { + super.streamMessageConversionQTestsFloat(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsDouble() throws java.lang.Exception { + super.streamMessageConversionQTestsDouble(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsString() throws java.lang.Exception { + super.streamMessageConversionQTestsString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsChar() throws java.lang.Exception { + super.streamMessageConversionQTestsChar(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsBytes() throws java.lang.Exception { + super.streamMessageConversionQTestsBytes(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageQTestsFullMsg() throws java.lang.Exception { + super.streamMessageQTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageQTestNull() throws java.lang.Exception { + super.streamMessageQTestNull(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java new file mode 100644 index 0000000000..1ad5c27720 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java @@ -0,0 +1,216 @@ +package com.sun.ts.tests.jms.core.streamMsgTopic; + +import com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgTopicTestsAppclientTest extends com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests { + static final String VEHICLE_ARCHIVE = "streamMsgTopic_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgTopic_appclient_vehicle: + streamMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle: + streamMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgTopic_jsp_vehicle: + streamMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgTopic_servlet_vehicle: + streamMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/streamMsgTopic/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive streamMsgTopic_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "streamMsgTopic_appclient_vehicle_client.jar"); + // The class files + streamMsgTopic_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + streamMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = StreamMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + streamMsgTopic_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + streamMsgTopic_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + StreamMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(streamMsgTopic_appclient_vehicle_client, StreamMsgTopicTests.class, resURL); + + // Ear + EnterpriseArchive streamMsgTopic_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgTopic_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgTopic_appclient_vehicle_ear.addAsModule(streamMsgTopic_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); + if(earResURL != null) { + streamMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgTopic_appclient_vehicle_ear, StreamMsgTopicTests.class, earResURL); + return streamMsgTopic_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsByte() throws java.lang.Exception { + super.streamMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsShort() throws java.lang.Exception { + super.streamMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsInt() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsLong() throws java.lang.Exception { + super.streamMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.streamMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.streamMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsChar() throws java.lang.Exception { + super.streamMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageTopicTestsFullMsg() throws java.lang.Exception { + super.streamMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageTopicTestNull() throws java.lang.Exception { + super.streamMessageTopicTestNull(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java new file mode 100644 index 0000000000..7d23996836 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java @@ -0,0 +1,252 @@ +package com.sun.ts.tests.jms.core.streamMsgTopic; + +import com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgTopicTestsEjbTest extends com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests { + static final String VEHICLE_ARCHIVE = "streamMsgTopic_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgTopic_appclient_vehicle: + streamMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle: + streamMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgTopic_jsp_vehicle: + streamMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgTopic_servlet_vehicle: + streamMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/streamMsgTopic/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive streamMsgTopic_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "streamMsgTopic_ejb_vehicle_client.jar"); + // The class files + streamMsgTopic_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + streamMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = StreamMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + streamMsgTopic_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + streamMsgTopic_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + StreamMsgTopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(streamMsgTopic_ejb_vehicle_client, StreamMsgTopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive streamMsgTopic_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "streamMsgTopic_ejb_vehicle_ejb.jar"); + // The class files + streamMsgTopic_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = StreamMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + streamMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = StreamMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + streamMsgTopic_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(streamMsgTopic_ejb_vehicle_ejb, StreamMsgTopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive streamMsgTopic_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgTopic_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgTopic_ejb_vehicle_ear.addAsModule(streamMsgTopic_ejb_vehicle_ejb); + streamMsgTopic_ejb_vehicle_ear.addAsModule(streamMsgTopic_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); + if(earResURL != null) { + streamMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgTopic_ejb_vehicle_ear, StreamMsgTopicTests.class, earResURL); + return streamMsgTopic_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsByte() throws java.lang.Exception { + super.streamMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsShort() throws java.lang.Exception { + super.streamMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsInt() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsLong() throws java.lang.Exception { + super.streamMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.streamMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.streamMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsChar() throws java.lang.Exception { + super.streamMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageTopicTestsFullMsg() throws java.lang.Exception { + super.streamMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageTopicTestNull() throws java.lang.Exception { + super.streamMessageTopicTestNull(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java new file mode 100644 index 0000000000..ada87f2e33 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java @@ -0,0 +1,235 @@ +package com.sun.ts.tests.jms.core.streamMsgTopic; + +import com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgTopicTestsJspTest extends com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests { + static final String VEHICLE_ARCHIVE = "streamMsgTopic_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgTopic_appclient_vehicle: + streamMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle: + streamMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgTopic_jsp_vehicle: + streamMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgTopic_servlet_vehicle: + streamMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/streamMsgTopic/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive streamMsgTopic_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "streamMsgTopic_jsp_vehicle_web.war"); + // The class files + streamMsgTopic_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + streamMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = StreamMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + streamMsgTopic_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + streamMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/jsp_vehicle_web.xml"); + if(warResURL != null) { + streamMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + streamMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + streamMsgTopic_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(streamMsgTopic_jsp_vehicle_web, StreamMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive streamMsgTopic_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgTopic_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgTopic_jsp_vehicle_ear.addAsModule(streamMsgTopic_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); + if(earResURL != null) { + streamMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgTopic_jsp_vehicle_ear, StreamMsgTopicTests.class, earResURL); + return streamMsgTopic_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsByte() throws java.lang.Exception { + super.streamMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsShort() throws java.lang.Exception { + super.streamMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsInt() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsLong() throws java.lang.Exception { + super.streamMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.streamMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.streamMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsChar() throws java.lang.Exception { + super.streamMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageTopicTestsFullMsg() throws java.lang.Exception { + super.streamMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageTopicTestNull() throws java.lang.Exception { + super.streamMessageTopicTestNull(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java new file mode 100644 index 0000000000..017d346f0c --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java @@ -0,0 +1,228 @@ +package com.sun.ts.tests.jms.core.streamMsgTopic; + +import com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class StreamMsgTopicTestsServletTest extends com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests { + static final String VEHICLE_ARCHIVE = "streamMsgTopic_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + streamMsgTopic_appclient_vehicle: + streamMsgTopic_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle: + streamMsgTopic_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + streamMsgTopic_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + streamMsgTopic_jsp_vehicle: + streamMsgTopic_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + streamMsgTopic_servlet_vehicle: + streamMsgTopic_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/streamMsgTopic/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive streamMsgTopic_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "streamMsgTopic_servlet_vehicle_web.war"); + // The class files + streamMsgTopic_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + streamMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = StreamMsgTopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + streamMsgTopic_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + streamMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/servlet_vehicle_web.xml"); + if(warResURL != null) { + streamMsgTopic_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(streamMsgTopic_servlet_vehicle_web, StreamMsgTopicTests.class, warResURL); + + // Ear + EnterpriseArchive streamMsgTopic_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "streamMsgTopic_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + streamMsgTopic_servlet_vehicle_ear.addAsModule(streamMsgTopic_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); + if(earResURL != null) { + streamMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + if(earResURL != null) { + streamMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(streamMsgTopic_servlet_vehicle_ear, StreamMsgTopicTests.class, earResURL); + return streamMsgTopic_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsByte() throws java.lang.Exception { + super.streamMessageConversionTopicTestsByte(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsShort() throws java.lang.Exception { + super.streamMessageConversionTopicTestsShort(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsInt() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInt(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsLong() throws java.lang.Exception { + super.streamMessageConversionTopicTestsLong(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.streamMessageConversionTopicTestsFloat(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.streamMessageConversionTopicTestsDouble(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsChar() throws java.lang.Exception { + super.streamMessageConversionTopicTestsChar(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.streamMessageConversionTopicTestsBytes(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.streamMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageTopicTestsFullMsg() throws java.lang.Exception { + super.streamMessageTopicTestsFullMsg(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageTopicTestNull() throws java.lang.Exception { + super.streamMessageTopicTestNull(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void streamMessageQNotWritable() throws java.lang.Exception { + super.streamMessageQNotWritable(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java new file mode 100644 index 0000000000..74b23b4635 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java @@ -0,0 +1,132 @@ +package com.sun.ts.tests.jms.core.topicConnection; + +import com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicConnectionTestsAppclientTest extends com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests { + static final String VEHICLE_ARCHIVE = "topicConnection_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + topicConnection_appclient_vehicle: + topicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle: + topicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicConnection_jsp_vehicle: + topicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicConnection_servlet_vehicle: + topicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/topicConnection/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topicConnection_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topicConnection_appclient_vehicle_client.jar"); + // The class files + topicConnection_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + topicConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topicConnection_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topicConnection_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topicConnection_appclient_vehicle_client, TopicConnectionTests.class, resURL); + + // Ear + EnterpriseArchive topicConnection_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicConnection_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicConnection_appclient_vehicle_ear.addAsModule(topicConnection_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); + if(earResURL != null) { + topicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + topicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicConnection_appclient_vehicle_ear, TopicConnectionTests.class, earResURL); + return topicConnection_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void connNotStartedTopicTest() throws java.lang.Exception { + super.connNotStartedTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java new file mode 100644 index 0000000000..2b7c6f5e81 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java @@ -0,0 +1,168 @@ +package com.sun.ts.tests.jms.core.topicConnection; + +import com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicConnectionTestsEjbTest extends com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests { + static final String VEHICLE_ARCHIVE = "topicConnection_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + topicConnection_appclient_vehicle: + topicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle: + topicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicConnection_jsp_vehicle: + topicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicConnection_servlet_vehicle: + topicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/topicConnection/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topicConnection_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topicConnection_ejb_vehicle_client.jar"); + // The class files + topicConnection_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + topicConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topicConnection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topicConnection_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicConnectionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topicConnection_ejb_vehicle_client, TopicConnectionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topicConnection_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "topicConnection_ejb_vehicle_ejb.jar"); + // The class files + topicConnection_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = TopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + topicConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = TopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topicConnection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topicConnection_ejb_vehicle_ejb, TopicConnectionTests.class, ejbResURL); + + // Ear + EnterpriseArchive topicConnection_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicConnection_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicConnection_ejb_vehicle_ear.addAsModule(topicConnection_ejb_vehicle_ejb); + topicConnection_ejb_vehicle_ear.addAsModule(topicConnection_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); + if(earResURL != null) { + topicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + topicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicConnection_ejb_vehicle_ear, TopicConnectionTests.class, earResURL); + return topicConnection_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void connNotStartedTopicTest() throws java.lang.Exception { + super.connNotStartedTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java new file mode 100644 index 0000000000..1d44d4a755 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.topicConnection; + +import com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicConnectionTestsJspTest extends com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests { + static final String VEHICLE_ARCHIVE = "topicConnection_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + topicConnection_appclient_vehicle: + topicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle: + topicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicConnection_jsp_vehicle: + topicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicConnection_servlet_vehicle: + topicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topicConnection/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topicConnection_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "topicConnection_jsp_vehicle_web.war"); + // The class files + topicConnection_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topicConnection_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + topicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + topicConnection_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topicConnection_jsp_vehicle_web, TopicConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive topicConnection_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicConnection_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicConnection_jsp_vehicle_ear.addAsModule(topicConnection_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); + if(earResURL != null) { + topicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + topicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicConnection_jsp_vehicle_ear, TopicConnectionTests.class, earResURL); + return topicConnection_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void connNotStartedTopicTest() throws java.lang.Exception { + super.connNotStartedTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java new file mode 100644 index 0000000000..3f729b0a01 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java @@ -0,0 +1,144 @@ +package com.sun.ts.tests.jms.core.topicConnection; + +import com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicConnectionTestsServletTest extends com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests { + static final String VEHICLE_ARCHIVE = "topicConnection_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + topicConnection_appclient_vehicle: + topicConnection_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle: + topicConnection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicConnection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicConnection_jsp_vehicle: + topicConnection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicConnection_servlet_vehicle: + topicConnection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topicConnection/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topicConnection_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "topicConnection_servlet_vehicle_web.war"); + // The class files + topicConnection_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicConnectionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topicConnection_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicConnection_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topicConnection_servlet_vehicle_web, TopicConnectionTests.class, warResURL); + + // Ear + EnterpriseArchive topicConnection_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicConnection_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicConnection_servlet_vehicle_ear.addAsModule(topicConnection_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); + if(earResURL != null) { + topicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + if(earResURL != null) { + topicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicConnection_servlet_vehicle_ear, TopicConnectionTests.class, earResURL); + return topicConnection_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void connNotStartedTopicTest() throws java.lang.Exception { + super.connNotStartedTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void metaDataTests() throws java.lang.Exception { + super.metaDataTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java new file mode 100644 index 0000000000..ece5db7e9d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java @@ -0,0 +1,181 @@ +package com.sun.ts.tests.jms.core.topicMsgHeaders; + +import com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicHeaderTestsAppclientTest extends com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests { + static final String VEHICLE_ARCHIVE = "topicMsgHeaders_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgHeaders_appclient_vehicle: + topicMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle: + topicMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgHeaders_jsp_vehicle: + topicMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgHeaders_servlet_vehicle: + topicMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/topicMsgHeaders/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topicMsgHeaders_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topicMsgHeaders_appclient_vehicle_client.jar"); + // The class files + topicMsgHeaders_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests.class + ); + // The application-client.xml descriptor + URL resURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + topicMsgHeaders_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topicMsgHeaders_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topicMsgHeaders_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicHeaderTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topicMsgHeaders_appclient_vehicle_client, TopicHeaderTests.class, resURL); + + // Ear + EnterpriseArchive topicMsgHeaders_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgHeaders_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgHeaders_appclient_vehicle_ear.addAsModule(topicMsgHeaders_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); + if(earResURL != null) { + topicMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgHeaders_appclient_vehicle_ear, TopicHeaderTests.class, earResURL); + return topicMsgHeaders_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrIDTopicTest() throws java.lang.Exception { + super.msgHdrIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrTimeStampTopicTest() throws java.lang.Exception { + super.msgHdrTimeStampTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrCorlIdTopicTest() throws java.lang.Exception { + super.msgHdrCorlIdTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrReplyToTopicTest() throws java.lang.Exception { + super.msgHdrReplyToTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSTypeTopicTest() throws java.lang.Exception { + super.msgHdrJMSTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSPriorityTopicTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSExpirationTopicTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDestinationTopicTest() throws java.lang.Exception { + super.msgHdrJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDeliveryModeTopicTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java new file mode 100644 index 0000000000..994a6448a9 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java @@ -0,0 +1,217 @@ +package com.sun.ts.tests.jms.core.topicMsgHeaders; + +import com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicHeaderTestsEjbTest extends com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests { + static final String VEHICLE_ARCHIVE = "topicMsgHeaders_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgHeaders_appclient_vehicle: + topicMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle: + topicMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgHeaders_jsp_vehicle: + topicMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgHeaders_servlet_vehicle: + topicMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/topicMsgHeaders/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topicMsgHeaders_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topicMsgHeaders_ejb_vehicle_client.jar"); + // The class files + topicMsgHeaders_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + topicMsgHeaders_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topicMsgHeaders_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topicMsgHeaders_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicHeaderTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topicMsgHeaders_ejb_vehicle_client, TopicHeaderTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topicMsgHeaders_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "topicMsgHeaders_ejb_vehicle_ejb.jar"); + // The class files + topicMsgHeaders_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = TopicHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + topicMsgHeaders_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = TopicHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topicMsgHeaders_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topicMsgHeaders_ejb_vehicle_ejb, TopicHeaderTests.class, ejbResURL); + + // Ear + EnterpriseArchive topicMsgHeaders_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgHeaders_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgHeaders_ejb_vehicle_ear.addAsModule(topicMsgHeaders_ejb_vehicle_ejb); + topicMsgHeaders_ejb_vehicle_ear.addAsModule(topicMsgHeaders_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); + if(earResURL != null) { + topicMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgHeaders_ejb_vehicle_ear, TopicHeaderTests.class, earResURL); + return topicMsgHeaders_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrIDTopicTest() throws java.lang.Exception { + super.msgHdrIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrTimeStampTopicTest() throws java.lang.Exception { + super.msgHdrTimeStampTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrCorlIdTopicTest() throws java.lang.Exception { + super.msgHdrCorlIdTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrReplyToTopicTest() throws java.lang.Exception { + super.msgHdrReplyToTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSTypeTopicTest() throws java.lang.Exception { + super.msgHdrJMSTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSPriorityTopicTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSExpirationTopicTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDestinationTopicTest() throws java.lang.Exception { + super.msgHdrJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDeliveryModeTopicTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java new file mode 100644 index 0000000000..717cd570bf --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java @@ -0,0 +1,200 @@ +package com.sun.ts.tests.jms.core.topicMsgHeaders; + +import com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicHeaderTestsJspTest extends com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests { + static final String VEHICLE_ARCHIVE = "topicMsgHeaders_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgHeaders_appclient_vehicle: + topicMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle: + topicMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgHeaders_jsp_vehicle: + topicMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgHeaders_servlet_vehicle: + topicMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topicMsgHeaders/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topicMsgHeaders_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "topicMsgHeaders_jsp_vehicle_web.war"); + // The class files + topicMsgHeaders_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests.class + ); + // The web.xml descriptor + URL warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicMsgHeaders_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topicMsgHeaders_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + topicMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + topicMsgHeaders_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topicMsgHeaders_jsp_vehicle_web, TopicHeaderTests.class, warResURL); + + // Ear + EnterpriseArchive topicMsgHeaders_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgHeaders_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgHeaders_jsp_vehicle_ear.addAsModule(topicMsgHeaders_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); + if(earResURL != null) { + topicMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgHeaders_jsp_vehicle_ear, TopicHeaderTests.class, earResURL); + return topicMsgHeaders_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrIDTopicTest() throws java.lang.Exception { + super.msgHdrIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrTimeStampTopicTest() throws java.lang.Exception { + super.msgHdrTimeStampTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrCorlIdTopicTest() throws java.lang.Exception { + super.msgHdrCorlIdTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrReplyToTopicTest() throws java.lang.Exception { + super.msgHdrReplyToTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSTypeTopicTest() throws java.lang.Exception { + super.msgHdrJMSTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSPriorityTopicTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSExpirationTopicTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDestinationTopicTest() throws java.lang.Exception { + super.msgHdrJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDeliveryModeTopicTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java new file mode 100644 index 0000000000..c8800d1cfd --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java @@ -0,0 +1,193 @@ +package com.sun.ts.tests.jms.core.topicMsgHeaders; + +import com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicHeaderTestsServletTest extends com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests { + static final String VEHICLE_ARCHIVE = "topicMsgHeaders_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgHeaders_appclient_vehicle: + topicMsgHeaders_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle: + topicMsgHeaders_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgHeaders_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgHeaders_jsp_vehicle: + topicMsgHeaders_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgHeaders_servlet_vehicle: + topicMsgHeaders_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topicMsgHeaders/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topicMsgHeaders_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "topicMsgHeaders_servlet_vehicle_web.war"); + // The class files + topicMsgHeaders_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests.class + ); + // The web.xml descriptor + URL warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicMsgHeaders_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicHeaderTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topicMsgHeaders_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicMsgHeaders_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicMsgHeaders_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topicMsgHeaders_servlet_vehicle_web, TopicHeaderTests.class, warResURL); + + // Ear + EnterpriseArchive topicMsgHeaders_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgHeaders_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgHeaders_servlet_vehicle_ear.addAsModule(topicMsgHeaders_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); + if(earResURL != null) { + topicMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgHeaders_servlet_vehicle_ear, TopicHeaderTests.class, earResURL); + return topicMsgHeaders_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrIDTopicTest() throws java.lang.Exception { + super.msgHdrIDTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrTimeStampTopicTest() throws java.lang.Exception { + super.msgHdrTimeStampTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrCorlIdTopicTest() throws java.lang.Exception { + super.msgHdrCorlIdTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrReplyToTopicTest() throws java.lang.Exception { + super.msgHdrReplyToTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSTypeTopicTest() throws java.lang.Exception { + super.msgHdrJMSTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSPriorityTopicTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSExpirationTopicTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDestinationTopicTest() throws java.lang.Exception { + super.msgHdrJMSDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDeliveryModeTopicTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java new file mode 100644 index 0000000000..1b21364a1d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java @@ -0,0 +1,139 @@ +package com.sun.ts.tests.jms.core.topicMsgProperties; + +import com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicPropertyTestsAppclientTest extends com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests { + static final String VEHICLE_ARCHIVE = "topicMsgProperties_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgProperties_appclient_vehicle: + topicMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle: + topicMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgProperties_jsp_vehicle: + topicMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgProperties_servlet_vehicle: + topicMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/topicMsgProperties/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topicMsgProperties_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topicMsgProperties_appclient_vehicle_client.jar"); + // The class files + topicMsgProperties_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + topicMsgProperties_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicPropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topicMsgProperties_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topicMsgProperties_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicPropertyTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topicMsgProperties_appclient_vehicle_client, TopicPropertyTests.class, resURL); + + // Ear + EnterpriseArchive topicMsgProperties_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgProperties_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgProperties_appclient_vehicle_ear.addAsModule(topicMsgProperties_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); + if(earResURL != null) { + topicMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgProperties_appclient_vehicle_ear, TopicPropertyTests.class, earResURL); + return topicMsgProperties_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesTopicTest() throws java.lang.Exception { + super.msgPropertiesTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesConversionTopicTest() throws java.lang.Exception { + super.msgPropertiesConversionTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgJMSXPropertiesTopicTest() throws java.lang.Exception { + super.msgJMSXPropertiesTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java new file mode 100644 index 0000000000..833e1d0e62 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java @@ -0,0 +1,175 @@ +package com.sun.ts.tests.jms.core.topicMsgProperties; + +import com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicPropertyTestsEjbTest extends com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests { + static final String VEHICLE_ARCHIVE = "topicMsgProperties_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgProperties_appclient_vehicle: + topicMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle: + topicMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgProperties_jsp_vehicle: + topicMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgProperties_servlet_vehicle: + topicMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/topicMsgProperties/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topicMsgProperties_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topicMsgProperties_ejb_vehicle_client.jar"); + // The class files + topicMsgProperties_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + topicMsgProperties_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicPropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topicMsgProperties_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topicMsgProperties_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicPropertyTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topicMsgProperties_ejb_vehicle_client, TopicPropertyTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topicMsgProperties_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "topicMsgProperties_ejb_vehicle_ejb.jar"); + // The class files + topicMsgProperties_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = TopicPropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + topicMsgProperties_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = TopicPropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topicMsgProperties_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topicMsgProperties_ejb_vehicle_ejb, TopicPropertyTests.class, ejbResURL); + + // Ear + EnterpriseArchive topicMsgProperties_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgProperties_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgProperties_ejb_vehicle_ear.addAsModule(topicMsgProperties_ejb_vehicle_ejb); + topicMsgProperties_ejb_vehicle_ear.addAsModule(topicMsgProperties_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); + if(earResURL != null) { + topicMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgProperties_ejb_vehicle_ear, TopicPropertyTests.class, earResURL); + return topicMsgProperties_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesTopicTest() throws java.lang.Exception { + super.msgPropertiesTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesConversionTopicTest() throws java.lang.Exception { + super.msgPropertiesConversionTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgJMSXPropertiesTopicTest() throws java.lang.Exception { + super.msgJMSXPropertiesTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java new file mode 100644 index 0000000000..f6c5f5a593 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java @@ -0,0 +1,158 @@ +package com.sun.ts.tests.jms.core.topicMsgProperties; + +import com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicPropertyTestsJspTest extends com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests { + static final String VEHICLE_ARCHIVE = "topicMsgProperties_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgProperties_appclient_vehicle: + topicMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle: + topicMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgProperties_jsp_vehicle: + topicMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgProperties_servlet_vehicle: + topicMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topicMsgProperties/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topicMsgProperties_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "topicMsgProperties_jsp_vehicle_web.war"); + // The class files + topicMsgProperties_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicMsgProperties_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicPropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topicMsgProperties_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/jsp_vehicle_web.xml"); + if(warResURL != null) { + topicMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + topicMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + topicMsgProperties_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topicMsgProperties_jsp_vehicle_web, TopicPropertyTests.class, warResURL); + + // Ear + EnterpriseArchive topicMsgProperties_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgProperties_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgProperties_jsp_vehicle_ear.addAsModule(topicMsgProperties_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); + if(earResURL != null) { + topicMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgProperties_jsp_vehicle_ear, TopicPropertyTests.class, earResURL); + return topicMsgProperties_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesTopicTest() throws java.lang.Exception { + super.msgPropertiesTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesConversionTopicTest() throws java.lang.Exception { + super.msgPropertiesConversionTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgJMSXPropertiesTopicTest() throws java.lang.Exception { + super.msgJMSXPropertiesTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java new file mode 100644 index 0000000000..ccfe13650d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.core.topicMsgProperties; + +import com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicPropertyTestsServletTest extends com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests { + static final String VEHICLE_ARCHIVE = "topicMsgProperties_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + topicMsgProperties_appclient_vehicle: + topicMsgProperties_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle: + topicMsgProperties_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topicMsgProperties_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topicMsgProperties_jsp_vehicle: + topicMsgProperties_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topicMsgProperties_servlet_vehicle: + topicMsgProperties_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topicMsgProperties/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topicMsgProperties_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "topicMsgProperties_servlet_vehicle_web.war"); + // The class files + topicMsgProperties_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicMsgProperties_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicPropertyTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topicMsgProperties_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicMsgProperties_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/servlet_vehicle_web.xml"); + if(warResURL != null) { + topicMsgProperties_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topicMsgProperties_servlet_vehicle_web, TopicPropertyTests.class, warResURL); + + // Ear + EnterpriseArchive topicMsgProperties_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topicMsgProperties_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topicMsgProperties_servlet_vehicle_ear.addAsModule(topicMsgProperties_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); + if(earResURL != null) { + topicMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + if(earResURL != null) { + topicMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topicMsgProperties_servlet_vehicle_ear, TopicPropertyTests.class, earResURL); + return topicMsgProperties_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesTopicTest() throws java.lang.Exception { + super.msgPropertiesTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesConversionTopicTest() throws java.lang.Exception { + super.msgPropertiesConversionTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgJMSXPropertiesTopicTest() throws java.lang.Exception { + super.msgJMSXPropertiesTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java new file mode 100644 index 0000000000..182c78feda --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java @@ -0,0 +1,237 @@ +package com.sun.ts.tests.jms.core.topictests; + +import com.sun.ts.tests.jms.core.topictests.TopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicTestsAppclientTest extends com.sun.ts.tests.jms.core.topictests.TopicTests { + static final String VEHICLE_ARCHIVE = "topictests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + topictests_appclient_vehicle: + topictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle: + topictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topictests_jsp_vehicle: + topictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topictests_servlet_vehicle: + topictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core/topictests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topictests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topictests_appclient_vehicle_client.jar"); + // The class files + topictests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topictests.TopicTests.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + topictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topictests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topictests_appclient_vehicle_client, TopicTests.class, resURL); + + // Ear + EnterpriseArchive topictests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topictests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topictests_appclient_vehicle_ear.addAsModule(topictests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); + if(earResURL != null) { + topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + if(earResURL != null) { + topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topictests_appclient_vehicle_ear, TopicTests.class, earResURL); + return topictests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void simpleSendReceiveTopicTest() throws java.lang.Exception { + super.simpleSendReceiveTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inactiveNonDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveNonDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void noLocalDeliveryTopicTest() throws java.lang.Exception { + super.noLocalDeliveryTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void simpleDurableSubscriberTopicTest() throws java.lang.Exception { + super.simpleDurableSubscriberTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void temporaryTopicConnectionClosesTest() throws java.lang.Exception { + super.temporaryTopicConnectionClosesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void temporaryTopicNotConsumableTest() throws java.lang.Exception { + super.temporaryTopicNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgSelectorMsgHeaderTopicTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inactiveDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableSubscriberTopicNoLocalTest() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableSubscriberTopicNoLocalTest2() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableSubscriberNewTopicTest() throws java.lang.Exception { + super.durableSubscriberNewTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableSubscriberChangeSelectorTest() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableSubscriberChangeSelectorTest2() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgProducerNullDestinationTopicTest() throws java.lang.Exception { + super.msgProducerNullDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void multipleCloseTopicConnectionTest() throws java.lang.Exception { + super.multipleCloseTopicConnectionTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void consumerTests() throws java.lang.Exception { + super.consumerTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void tempTopicTests() throws java.lang.Exception { + super.tempTopicTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java new file mode 100644 index 0000000000..c068ddf739 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java @@ -0,0 +1,273 @@ +package com.sun.ts.tests.jms.core.topictests; + +import com.sun.ts.tests.jms.core.topictests.TopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicTestsEjbTest extends com.sun.ts.tests.jms.core.topictests.TopicTests { + static final String VEHICLE_ARCHIVE = "topictests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + topictests_appclient_vehicle: + topictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle: + topictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topictests_jsp_vehicle: + topictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topictests_servlet_vehicle: + topictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core/topictests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topictests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "topictests_ejb_vehicle_client.jar"); + // The class files + topictests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + topictests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + topictests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + topictests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TopicTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topictests_ejb_vehicle_client, TopicTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topictests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "topictests_ejb_vehicle_ejb.jar"); + // The class files + topictests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topictests.TopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + topictests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topictests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topictests_ejb_vehicle_ejb, TopicTests.class, ejbResURL); + + // Ear + EnterpriseArchive topictests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topictests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topictests_ejb_vehicle_ear.addAsModule(topictests_ejb_vehicle_ejb); + topictests_ejb_vehicle_ear.addAsModule(topictests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); + if(earResURL != null) { + topictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + if(earResURL != null) { + topictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topictests_ejb_vehicle_ear, TopicTests.class, earResURL); + return topictests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void simpleSendReceiveTopicTest() throws java.lang.Exception { + super.simpleSendReceiveTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inactiveNonDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveNonDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void noLocalDeliveryTopicTest() throws java.lang.Exception { + super.noLocalDeliveryTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void simpleDurableSubscriberTopicTest() throws java.lang.Exception { + super.simpleDurableSubscriberTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void temporaryTopicConnectionClosesTest() throws java.lang.Exception { + super.temporaryTopicConnectionClosesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void temporaryTopicNotConsumableTest() throws java.lang.Exception { + super.temporaryTopicNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgSelectorMsgHeaderTopicTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inactiveDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableSubscriberTopicNoLocalTest() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableSubscriberTopicNoLocalTest2() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableSubscriberNewTopicTest() throws java.lang.Exception { + super.durableSubscriberNewTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableSubscriberChangeSelectorTest() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableSubscriberChangeSelectorTest2() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgProducerNullDestinationTopicTest() throws java.lang.Exception { + super.msgProducerNullDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void multipleCloseTopicConnectionTest() throws java.lang.Exception { + super.multipleCloseTopicConnectionTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void consumerTests() throws java.lang.Exception { + super.consumerTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void tempTopicTests() throws java.lang.Exception { + super.tempTopicTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java new file mode 100644 index 0000000000..c90e96525e --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java @@ -0,0 +1,256 @@ +package com.sun.ts.tests.jms.core.topictests; + +import com.sun.ts.tests.jms.core.topictests.TopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicTestsJspTest extends com.sun.ts.tests.jms.core.topictests.TopicTests { + static final String VEHICLE_ARCHIVE = "topictests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + topictests_appclient_vehicle: + topictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle: + topictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topictests_jsp_vehicle: + topictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topictests_servlet_vehicle: + topictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topictests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topictests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "topictests_jsp_vehicle_web.war"); + // The class files + topictests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topictests.TopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topictests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topictests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + topictests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/jsp_vehicle_web.xml"); + if(warResURL != null) { + topictests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + topictests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + topictests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topictests_jsp_vehicle_web, TopicTests.class, warResURL); + + // Ear + EnterpriseArchive topictests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topictests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topictests_jsp_vehicle_ear.addAsModule(topictests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); + if(earResURL != null) { + topictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + if(earResURL != null) { + topictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topictests_jsp_vehicle_ear, TopicTests.class, earResURL); + return topictests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void simpleSendReceiveTopicTest() throws java.lang.Exception { + super.simpleSendReceiveTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inactiveNonDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveNonDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void noLocalDeliveryTopicTest() throws java.lang.Exception { + super.noLocalDeliveryTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void simpleDurableSubscriberTopicTest() throws java.lang.Exception { + super.simpleDurableSubscriberTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void temporaryTopicConnectionClosesTest() throws java.lang.Exception { + super.temporaryTopicConnectionClosesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void temporaryTopicNotConsumableTest() throws java.lang.Exception { + super.temporaryTopicNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgSelectorMsgHeaderTopicTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inactiveDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableSubscriberTopicNoLocalTest() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableSubscriberTopicNoLocalTest2() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableSubscriberNewTopicTest() throws java.lang.Exception { + super.durableSubscriberNewTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableSubscriberChangeSelectorTest() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableSubscriberChangeSelectorTest2() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgProducerNullDestinationTopicTest() throws java.lang.Exception { + super.msgProducerNullDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void multipleCloseTopicConnectionTest() throws java.lang.Exception { + super.multipleCloseTopicConnectionTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void consumerTests() throws java.lang.Exception { + super.consumerTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void tempTopicTests() throws java.lang.Exception { + super.tempTopicTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java new file mode 100644 index 0000000000..e3add70cb2 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java @@ -0,0 +1,249 @@ +package com.sun.ts.tests.jms.core.topictests; + +import com.sun.ts.tests.jms.core.topictests.TopicTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TopicTestsServletTest extends com.sun.ts.tests.jms.core.topictests.TopicTests { + static final String VEHICLE_ARCHIVE = "topictests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + topictests_appclient_vehicle: + topictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle: + topictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + topictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + topictests_jsp_vehicle: + topictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + topictests_servlet_vehicle: + topictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core/topictests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive topictests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "topictests_servlet_vehicle_web.war"); + // The class files + topictests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core.topictests.TopicTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topictests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TopicTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + topictests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + topictests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/servlet_vehicle_web.xml"); + if(warResURL != null) { + topictests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(topictests_servlet_vehicle_web, TopicTests.class, warResURL); + + // Ear + EnterpriseArchive topictests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "topictests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topictests_servlet_vehicle_ear.addAsModule(topictests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); + if(earResURL != null) { + topictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + if(earResURL != null) { + topictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topictests_servlet_vehicle_ear, TopicTests.class, earResURL); + return topictests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void simpleSendReceiveTopicTest() throws java.lang.Exception { + super.simpleSendReceiveTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inactiveNonDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveNonDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void noLocalDeliveryTopicTest() throws java.lang.Exception { + super.noLocalDeliveryTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void simpleDurableSubscriberTopicTest() throws java.lang.Exception { + super.simpleDurableSubscriberTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void temporaryTopicConnectionClosesTest() throws java.lang.Exception { + super.temporaryTopicConnectionClosesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void temporaryTopicNotConsumableTest() throws java.lang.Exception { + super.temporaryTopicNotConsumableTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgSelectorMsgHeaderTopicTest() throws java.lang.Exception { + super.msgSelectorMsgHeaderTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inactiveDurableSubscriberTopicRecTest() throws java.lang.Exception { + super.inactiveDurableSubscriberTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableSubscriberTopicNoLocalTest() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableSubscriberTopicNoLocalTest2() throws java.lang.Exception { + super.durableSubscriberTopicNoLocalTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableSubscriberNewTopicTest() throws java.lang.Exception { + super.durableSubscriberNewTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableSubscriberChangeSelectorTest() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableSubscriberChangeSelectorTest2() throws java.lang.Exception { + super.durableSubscriberChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgProducerNullDestinationTopicTest() throws java.lang.Exception { + super.msgProducerNullDestinationTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void multipleCloseTopicConnectionTest() throws java.lang.Exception { + super.multipleCloseTopicConnectionTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void consumerTests() throws java.lang.Exception { + super.consumerTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void tempTopicTests() throws java.lang.Exception { + super.tempTopicTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java new file mode 100644 index 0000000000..4139afcb57 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java @@ -0,0 +1,133 @@ +package com.sun.ts.tests.jms.core20.appclient.jmsconsumertests; + +import com.sun.ts.tests.jms.core20.appclient.jmsconsumertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.appclient.jmsconsumertests.Client { + static final String VEHICLE_ARCHIVE = "jmsconsumertests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsconsumertests_appclient_vehicle: + jmsconsumertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle: + jmsconsumertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsconsumertests_jsp_vehicle: + jmsconsumertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsconsumertests_servlet_vehicle: + jmsconsumertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsconsumertests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsconsumertests_appclient_vehicle_client.jar"); + // The class files + jmsconsumertests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.appclient.jmsconsumertests.MyMessageListener.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core20.appclient.jmsconsumertests.Client.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmsconsumertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsconsumertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsconsumertests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsconsumertests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmsconsumertests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsconsumertests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsconsumertests_appclient_vehicle_ear.addAsModule(jmsconsumertests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/"); + if(earResURL != null) { + jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsconsumertests_appclient_vehicle_ear, Client.class, earResURL); + return jmsconsumertests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendRecvMessageListenerTest() throws java.lang.Exception { + super.queueSendRecvMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendRecvMessageListenerTest() throws java.lang.Exception { + super.topicSendRecvMessageListenerTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java new file mode 100644 index 0000000000..c965e268f0 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java @@ -0,0 +1,249 @@ +package com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests; + +import com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmscontextqueuetests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontextqueuetests_appclient_vehicle: + jmscontextqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle: + jmscontextqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontextqueuetests_jsp_vehicle: + jmscontextqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontextqueuetests_servlet_vehicle: + jmscontextqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmscontextqueuetests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmscontextqueuetests_appclient_vehicle_client.jar"); + // The class files + jmscontextqueuetests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.MyCompletionListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.MyExceptionListener.class, + com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.MyCompletionListener2.class, + com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.MyMessageListener.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.MyMessageListener2.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmscontextqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmscontextqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmscontextqueuetests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmscontextqueuetests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmscontextqueuetests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontextqueuetests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontextqueuetests_appclient_vehicle_ear.addAsModule(jmscontextqueuetests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/"); + if(earResURL != null) { + jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontextqueuetests_appclient_vehicle_ear, Client.class, earResURL); + return jmscontextqueuetests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetClientIDTest() throws java.lang.Exception { + super.setGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setClientIDLateTest() throws java.lang.Exception { + super.setClientIDLateTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetChangeClientIDTest() throws java.lang.Exception { + super.setGetChangeClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetExceptionListenerTest() throws java.lang.Exception { + super.setGetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAsyncTest() throws java.lang.Exception { + super.setGetAsyncTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void startStopTest() throws java.lang.Exception { + super.startStopTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createContextTest() throws java.lang.Exception { + super.createContextTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvCLTest1() throws java.lang.Exception { + super.sendAndRecvCLTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvCLTest2() throws java.lang.Exception { + super.sendAndRecvCLTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvMsgOfEachTypeCLTest() throws java.lang.Exception { + super.sendAndRecvMsgOfEachTypeCLTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvMsgOfEachTypeMLTest() throws java.lang.Exception { + super.sendAndRecvMsgOfEachTypeMLTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageOrderCLQueueTest() throws java.lang.Exception { + super.messageOrderCLQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void commitRollbackTest() throws java.lang.Exception { + super.commitRollbackTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void recoverAckTest() throws java.lang.Exception { + super.recoverAckTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageFormatRuntimeExceptionTests() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jMSRuntimeExceptionTests() throws java.lang.Exception { + super.jMSRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateRuntimeExceptionTests() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java new file mode 100644 index 0000000000..9f489a5268 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java @@ -0,0 +1,240 @@ +package com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests; + +import com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.Client { + static final String VEHICLE_ARCHIVE = "jmscontexttopictests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontexttopictests_appclient_vehicle: + jmscontexttopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle: + jmscontexttopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontexttopictests_jsp_vehicle: + jmscontexttopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontexttopictests_servlet_vehicle: + jmscontexttopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmscontexttopictests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmscontexttopictests_appclient_vehicle_client.jar"); + // The class files + jmscontexttopictests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.MyExceptionListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.MyCompletionListener.class, + com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.Client.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.MyCompletionListener2.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmscontexttopictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmscontexttopictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmscontexttopictests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmscontexttopictests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmscontexttopictests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontexttopictests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontexttopictests_appclient_vehicle_ear.addAsModule(jmscontexttopictests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/"); + if(earResURL != null) { + jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontexttopictests_appclient_vehicle_ear, Client.class, earResURL); + return jmscontexttopictests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetClientIDTest() throws java.lang.Exception { + super.setGetClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setClientIDLateTest() throws java.lang.Exception { + super.setClientIDLateTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setClientIDOnAdminConfiguredIDTest() throws java.lang.Exception { + super.setClientIDOnAdminConfiguredIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetChangeClientIDTest() throws java.lang.Exception { + super.setGetChangeClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetExceptionListenerTest() throws java.lang.Exception { + super.setGetExceptionListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAsyncTest() throws java.lang.Exception { + super.setGetAsyncTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void startStopTest() throws java.lang.Exception { + super.startStopTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createContextTest() throws java.lang.Exception { + super.createContextTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvCLTest1() throws java.lang.Exception { + super.sendAndRecvCLTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvCLTest2() throws java.lang.Exception { + super.sendAndRecvCLTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvMsgOfEachTypeCLTest() throws java.lang.Exception { + super.sendAndRecvMsgOfEachTypeCLTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageOrderCLTopicTest() throws java.lang.Exception { + super.messageOrderCLTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void acknowledgeTest() throws java.lang.Exception { + super.acknowledgeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void commitRollbackTest() throws java.lang.Exception { + super.commitRollbackTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageFormatRuntimeExceptionTests() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jMSRuntimeExceptionTests() throws java.lang.Exception { + super.jMSRuntimeExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java new file mode 100644 index 0000000000..b6f137110d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java @@ -0,0 +1,150 @@ +package com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests; + +import com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.Client { + static final String VEHICLE_ARCHIVE = "listenerexceptiontests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + listenerexceptiontests_appclient_vehicle: + listenerexceptiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive listenerexceptiontests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "listenerexceptiontests_appclient_vehicle_client.jar"); + // The class files + listenerexceptiontests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.Client.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.MyCompletionListener.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.MyMessageListener.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + listenerexceptiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + listenerexceptiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + listenerexceptiontests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(listenerexceptiontests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive listenerexceptiontests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "listenerexceptiontests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + listenerexceptiontests_appclient_vehicle_ear.addAsModule(listenerexceptiontests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/"); + if(earResURL != null) { + listenerexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/.ear.sun-application.xml"); + if(earResURL != null) { + listenerexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(listenerexceptiontests_appclient_vehicle_ear, Client.class, earResURL); + return listenerexceptiontests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateExceptionTest1() throws java.lang.Exception { + super.illegalStateExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateExceptionTest2() throws java.lang.Exception { + super.illegalStateExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateExceptionTest3() throws java.lang.Exception { + super.illegalStateExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void callingMessageConsumerCloseIsAllowed() throws java.lang.Exception { + super.callingMessageConsumerCloseIsAllowed(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void callingJMSConsumerCloseIsAllowed() throws java.lang.Exception { + super.callingJMSConsumerCloseIsAllowed(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java new file mode 100644 index 0000000000..6486fa5f15 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java @@ -0,0 +1,128 @@ +package com.sun.ts.tests.jms.core20.appclient.messageconsumertests; + +import com.sun.ts.tests.jms.core20.appclient.messageconsumertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.appclient.messageconsumertests.Client { + static final String VEHICLE_ARCHIVE = "messageconsumertests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + messageconsumertests_appclient_vehicle: + messageconsumertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/appclient/messageconsumertests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive messageconsumertests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "messageconsumertests_appclient_vehicle_client.jar"); + // The class files + messageconsumertests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.TextMessageTestImpl.class, + com.sun.ts.tests.jms.core20.appclient.messageconsumertests.Client.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.core20.appclient.messageconsumertests.MyMessageListener.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + messageconsumertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + messageconsumertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + messageconsumertests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(messageconsumertests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive messageconsumertests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageconsumertests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageconsumertests_appclient_vehicle_ear.addAsModule(messageconsumertests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/"); + if(earResURL != null) { + messageconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/.ear.sun-application.xml"); + if(earResURL != null) { + messageconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageconsumertests_appclient_vehicle_ear, Client.class, earResURL); + return messageconsumertests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendRecvMessageListenerTest() throws java.lang.Exception { + super.queueSendRecvMessageListenerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendRecvMessageListenerTest() throws java.lang.Exception { + super.topicSendRecvMessageListenerTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java new file mode 100644 index 0000000000..adbd746bfe --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java @@ -0,0 +1,261 @@ +package com.sun.ts.tests.jms.core20.appclient.messageproducertests; + +import com.sun.ts.tests.jms.core20.appclient.messageproducertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.appclient.messageproducertests.Client { + static final String VEHICLE_ARCHIVE = "messageproducertests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + messageproducertests_appclient_vehicle: + messageproducertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle: + messageproducertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageproducertests_jsp_vehicle: + messageproducertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageproducertests_servlet_vehicle: + messageproducertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/appclient/messageproducertests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive messageproducertests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "messageproducertests_appclient_vehicle_client.jar"); + // The class files + messageproducertests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.core20.appclient.messageproducertests.MyCompletionListener.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.MessageTestImpl.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jms.common.InvalidTextMessageTestImpl.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core20.appclient.messageproducertests.Client.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + messageproducertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + messageproducertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + messageproducertests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(messageproducertests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive messageproducertests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageproducertests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageproducertests_appclient_vehicle_ear.addAsModule(messageproducertests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageproducertests/"); + if(earResURL != null) { + messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageproducertests/.ear.sun-application.xml"); + if(earResURL != null) { + messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageproducertests_appclient_vehicle_ear, Client.class, earResURL); + return messageproducertests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendRecvCompletionListenerTest1() throws java.lang.Exception { + super.queueSendRecvCompletionListenerTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendRecvCompletionListenerTest2() throws java.lang.Exception { + super.queueSendRecvCompletionListenerTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendRecvCompletionListenerTest3() throws java.lang.Exception { + super.queueSendRecvCompletionListenerTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendRecvCompletionListenerTest4() throws java.lang.Exception { + super.queueSendRecvCompletionListenerTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueJMSExceptionTests() throws java.lang.Exception { + super.queueJMSExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueInvalidDestinationExceptionTests() throws java.lang.Exception { + super.queueInvalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.queueUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueIllegalArgumentExceptionTests() throws java.lang.Exception { + super.queueIllegalArgumentExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueMessageFormatExceptionTests() throws java.lang.Exception { + super.queueMessageFormatExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueIllegalStateExceptionTests() throws java.lang.Exception { + super.queueIllegalStateExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendRecvCompletionListenerTest1() throws java.lang.Exception { + super.topicSendRecvCompletionListenerTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendRecvCompletionListenerTest2() throws java.lang.Exception { + super.topicSendRecvCompletionListenerTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendRecvCompletionListenerTest3() throws java.lang.Exception { + super.topicSendRecvCompletionListenerTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendRecvCompletionListenerTest4() throws java.lang.Exception { + super.topicSendRecvCompletionListenerTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicJMSExceptionTests() throws java.lang.Exception { + super.topicJMSExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicInvalidDestinationExceptionTests() throws java.lang.Exception { + super.topicInvalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.topicUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicIllegalArgumentExceptionTests() throws java.lang.Exception { + super.topicIllegalArgumentExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicMessageFormatExceptionTests() throws java.lang.Exception { + super.topicMessageFormatExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicIllegalStateExceptionTests() throws java.lang.Exception { + super.topicIllegalStateExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java new file mode 100644 index 0000000000..2f03ba0a43 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java @@ -0,0 +1,174 @@ +package com.sun.ts.tests.jms.core20.connectionfactorytests; + +import com.sun.ts.tests.jms.core20.connectionfactorytests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.connectionfactorytests.Client { + static final String VEHICLE_ARCHIVE = "connectionfactorytests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + connectionfactorytests_appclient_vehicle: + connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle: + connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + connectionfactorytests_jsp_vehicle: + connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + connectionfactorytests_servlet_vehicle: + connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/connectionfactorytests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive connectionfactorytests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "connectionfactorytests_appclient_vehicle_client.jar"); + // The class files + connectionfactorytests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.connectionfactorytests.Client.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + connectionfactorytests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + connectionfactorytests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + connectionfactorytests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(connectionfactorytests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive connectionfactorytests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connectionfactorytests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + connectionfactorytests_appclient_vehicle_ear.addAsModule(connectionfactorytests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); + if(earResURL != null) { + connectionfactorytests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + if(earResURL != null) { + connectionfactorytests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(connectionfactorytests_appclient_vehicle_ear, Client.class, earResURL); + return connectionfactorytests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void qcfCreateJMSContextTest1() throws java.lang.Exception { + super.qcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void qcfCreateJMSContextTest3() throws java.lang.Exception { + super.qcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void qcfCreateConnectionTest() throws java.lang.Exception { + super.qcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void tcfCreateJMSContextTest1() throws java.lang.Exception { + super.tcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void tcfCreateJMSContextTest3() throws java.lang.Exception { + super.tcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void tcfCreateConnectionTest() throws java.lang.Exception { + super.tcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createConnectionExceptionTests() throws java.lang.Exception { + super.createConnectionExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createJMSContextExceptionTests() throws java.lang.Exception { + super.createJMSContextExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java new file mode 100644 index 0000000000..3d17e648fe --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java @@ -0,0 +1,210 @@ +package com.sun.ts.tests.jms.core20.connectionfactorytests; + +import com.sun.ts.tests.jms.core20.connectionfactorytests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.connectionfactorytests.Client { + static final String VEHICLE_ARCHIVE = "connectionfactorytests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + connectionfactorytests_appclient_vehicle: + connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle: + connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + connectionfactorytests_jsp_vehicle: + connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + connectionfactorytests_servlet_vehicle: + connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/connectionfactorytests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive connectionfactorytests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "connectionfactorytests_ejb_vehicle_client.jar"); + // The class files + connectionfactorytests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + connectionfactorytests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + connectionfactorytests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + connectionfactorytests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(connectionfactorytests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive connectionfactorytests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "connectionfactorytests_ejb_vehicle_ejb.jar"); + // The class files + connectionfactorytests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.tests.jms.core20.connectionfactorytests.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + connectionfactorytests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + connectionfactorytests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(connectionfactorytests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive connectionfactorytests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connectionfactorytests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + connectionfactorytests_ejb_vehicle_ear.addAsModule(connectionfactorytests_ejb_vehicle_ejb); + connectionfactorytests_ejb_vehicle_ear.addAsModule(connectionfactorytests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); + if(earResURL != null) { + connectionfactorytests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + if(earResURL != null) { + connectionfactorytests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(connectionfactorytests_ejb_vehicle_ear, Client.class, earResURL); + return connectionfactorytests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void qcfCreateJMSContextTest1() throws java.lang.Exception { + super.qcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void qcfCreateJMSContextTest3() throws java.lang.Exception { + super.qcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void qcfCreateConnectionTest() throws java.lang.Exception { + super.qcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void tcfCreateJMSContextTest1() throws java.lang.Exception { + super.tcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void tcfCreateJMSContextTest3() throws java.lang.Exception { + super.tcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void tcfCreateConnectionTest() throws java.lang.Exception { + super.tcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createConnectionExceptionTests() throws java.lang.Exception { + super.createConnectionExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createJMSContextExceptionTests() throws java.lang.Exception { + super.createJMSContextExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java new file mode 100644 index 0000000000..789da3f034 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java @@ -0,0 +1,193 @@ +package com.sun.ts.tests.jms.core20.connectionfactorytests; + +import com.sun.ts.tests.jms.core20.connectionfactorytests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.connectionfactorytests.Client { + static final String VEHICLE_ARCHIVE = "connectionfactorytests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + connectionfactorytests_appclient_vehicle: + connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle: + connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + connectionfactorytests_jsp_vehicle: + connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + connectionfactorytests_servlet_vehicle: + connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/connectionfactorytests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive connectionfactorytests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "connectionfactorytests_jsp_vehicle_web.war"); + // The class files + connectionfactorytests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.core20.connectionfactorytests.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + connectionfactorytests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + connectionfactorytests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + connectionfactorytests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/jsp_vehicle_web.xml"); + if(warResURL != null) { + connectionfactorytests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + connectionfactorytests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + connectionfactorytests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(connectionfactorytests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive connectionfactorytests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connectionfactorytests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + connectionfactorytests_jsp_vehicle_ear.addAsModule(connectionfactorytests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); + if(earResURL != null) { + connectionfactorytests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + if(earResURL != null) { + connectionfactorytests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(connectionfactorytests_jsp_vehicle_ear, Client.class, earResURL); + return connectionfactorytests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void qcfCreateJMSContextTest1() throws java.lang.Exception { + super.qcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void qcfCreateJMSContextTest3() throws java.lang.Exception { + super.qcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void qcfCreateConnectionTest() throws java.lang.Exception { + super.qcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void tcfCreateJMSContextTest1() throws java.lang.Exception { + super.tcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void tcfCreateJMSContextTest3() throws java.lang.Exception { + super.tcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void tcfCreateConnectionTest() throws java.lang.Exception { + super.tcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createConnectionExceptionTests() throws java.lang.Exception { + super.createConnectionExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createJMSContextExceptionTests() throws java.lang.Exception { + super.createJMSContextExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java new file mode 100644 index 0000000000..cfb2e2460a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java @@ -0,0 +1,186 @@ +package com.sun.ts.tests.jms.core20.connectionfactorytests; + +import com.sun.ts.tests.jms.core20.connectionfactorytests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.connectionfactorytests.Client { + static final String VEHICLE_ARCHIVE = "connectionfactorytests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + connectionfactorytests_appclient_vehicle: + connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle: + connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + connectionfactorytests_jsp_vehicle: + connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + connectionfactorytests_servlet_vehicle: + connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/connectionfactorytests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive connectionfactorytests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "connectionfactorytests_servlet_vehicle_web.war"); + // The class files + connectionfactorytests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.jms.core20.connectionfactorytests.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + connectionfactorytests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + connectionfactorytests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + connectionfactorytests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/servlet_vehicle_web.xml"); + if(warResURL != null) { + connectionfactorytests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(connectionfactorytests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive connectionfactorytests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connectionfactorytests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + connectionfactorytests_servlet_vehicle_ear.addAsModule(connectionfactorytests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); + if(earResURL != null) { + connectionfactorytests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + if(earResURL != null) { + connectionfactorytests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(connectionfactorytests_servlet_vehicle_ear, Client.class, earResURL); + return connectionfactorytests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void qcfCreateJMSContextTest1() throws java.lang.Exception { + super.qcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void qcfCreateJMSContextTest3() throws java.lang.Exception { + super.qcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void qcfCreateConnectionTest() throws java.lang.Exception { + super.qcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void tcfCreateJMSContextTest1() throws java.lang.Exception { + super.tcfCreateJMSContextTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void tcfCreateJMSContextTest3() throws java.lang.Exception { + super.tcfCreateJMSContextTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void tcfCreateConnectionTest() throws java.lang.Exception { + super.tcfCreateConnectionTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createConnectionExceptionTests() throws java.lang.Exception { + super.createConnectionExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createJMSContextExceptionTests() throws java.lang.Exception { + super.createJMSContextExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java new file mode 100644 index 0000000000..365a49081f --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java @@ -0,0 +1,188 @@ +package com.sun.ts.tests.jms.core20.jmsconsumertests; + +import com.sun.ts.tests.jms.core20.jmsconsumertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.jmsconsumertests.Client { + static final String VEHICLE_ARCHIVE = "jmsconsumertests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsconsumertests_appclient_vehicle: + jmsconsumertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle: + jmsconsumertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsconsumertests_jsp_vehicle: + jmsconsumertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsconsumertests_servlet_vehicle: + jmsconsumertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/jmsconsumertests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsconsumertests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsconsumertests_appclient_vehicle_client.jar"); + // The class files + jmsconsumertests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core20.jmsconsumertests.Client.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmsconsumertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsconsumertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsconsumertests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsconsumertests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmsconsumertests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsconsumertests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsconsumertests_appclient_vehicle_ear.addAsModule(jmsconsumertests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); + if(earResURL != null) { + jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsconsumertests_appclient_vehicle_ear, Client.class, earResURL); + return jmsconsumertests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueReceiveTests() throws java.lang.Exception { + super.queueReceiveTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueReceiveBodyTests() throws java.lang.Exception { + super.queueReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueReceiveBodyExceptionTests() throws java.lang.Exception { + super.queueReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueGetMessageSelectorTest() throws java.lang.Exception { + super.queueGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueCloseTest() throws java.lang.Exception { + super.queueCloseTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicReceiveTests() throws java.lang.Exception { + super.topicReceiveTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicReceiveBodyTests() throws java.lang.Exception { + super.topicReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicReceiveBodyExceptionTests() throws java.lang.Exception { + super.topicReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicGetMessageSelectorTest() throws java.lang.Exception { + super.topicGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicCloseTest() throws java.lang.Exception { + super.topicCloseTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java new file mode 100644 index 0000000000..7e15750f99 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java @@ -0,0 +1,224 @@ +package com.sun.ts.tests.jms.core20.jmsconsumertests; + +import com.sun.ts.tests.jms.core20.jmsconsumertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.jmsconsumertests.Client { + static final String VEHICLE_ARCHIVE = "jmsconsumertests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsconsumertests_appclient_vehicle: + jmsconsumertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle: + jmsconsumertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsconsumertests_jsp_vehicle: + jmsconsumertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsconsumertests_servlet_vehicle: + jmsconsumertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/jmsconsumertests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsconsumertests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsconsumertests_ejb_vehicle_client.jar"); + // The class files + jmsconsumertests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + jmsconsumertests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsconsumertests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsconsumertests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsconsumertests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jmsconsumertests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jmsconsumertests_ejb_vehicle_ejb.jar"); + // The class files + jmsconsumertests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.core20.jmsconsumertests.Client.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + jmsconsumertests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jmsconsumertests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jmsconsumertests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jmsconsumertests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsconsumertests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsconsumertests_ejb_vehicle_ear.addAsModule(jmsconsumertests_ejb_vehicle_ejb); + jmsconsumertests_ejb_vehicle_ear.addAsModule(jmsconsumertests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); + if(earResURL != null) { + jmsconsumertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsconsumertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsconsumertests_ejb_vehicle_ear, Client.class, earResURL); + return jmsconsumertests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueReceiveTests() throws java.lang.Exception { + super.queueReceiveTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueReceiveBodyTests() throws java.lang.Exception { + super.queueReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueReceiveBodyExceptionTests() throws java.lang.Exception { + super.queueReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueGetMessageSelectorTest() throws java.lang.Exception { + super.queueGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueCloseTest() throws java.lang.Exception { + super.queueCloseTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicReceiveTests() throws java.lang.Exception { + super.topicReceiveTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicReceiveBodyTests() throws java.lang.Exception { + super.topicReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicReceiveBodyExceptionTests() throws java.lang.Exception { + super.topicReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicGetMessageSelectorTest() throws java.lang.Exception { + super.topicGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicCloseTest() throws java.lang.Exception { + super.topicCloseTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java new file mode 100644 index 0000000000..4a47a9c987 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java @@ -0,0 +1,207 @@ +package com.sun.ts.tests.jms.core20.jmsconsumertests; + +import com.sun.ts.tests.jms.core20.jmsconsumertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.jmsconsumertests.Client { + static final String VEHICLE_ARCHIVE = "jmsconsumertests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsconsumertests_appclient_vehicle: + jmsconsumertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle: + jmsconsumertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsconsumertests_jsp_vehicle: + jmsconsumertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsconsumertests_servlet_vehicle: + jmsconsumertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmsconsumertests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmsconsumertests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmsconsumertests_jsp_vehicle_web.war"); + // The class files + jmsconsumertests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core20.jmsconsumertests.Client.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsconsumertests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmsconsumertests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsconsumertests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsconsumertests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + jmsconsumertests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + jmsconsumertests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmsconsumertests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmsconsumertests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsconsumertests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsconsumertests_jsp_vehicle_ear.addAsModule(jmsconsumertests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); + if(earResURL != null) { + jmsconsumertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsconsumertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsconsumertests_jsp_vehicle_ear, Client.class, earResURL); + return jmsconsumertests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueReceiveTests() throws java.lang.Exception { + super.queueReceiveTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueReceiveBodyTests() throws java.lang.Exception { + super.queueReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueReceiveBodyExceptionTests() throws java.lang.Exception { + super.queueReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueGetMessageSelectorTest() throws java.lang.Exception { + super.queueGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueCloseTest() throws java.lang.Exception { + super.queueCloseTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicReceiveTests() throws java.lang.Exception { + super.topicReceiveTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicReceiveBodyTests() throws java.lang.Exception { + super.topicReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicReceiveBodyExceptionTests() throws java.lang.Exception { + super.topicReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicGetMessageSelectorTest() throws java.lang.Exception { + super.topicGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicCloseTest() throws java.lang.Exception { + super.topicCloseTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java new file mode 100644 index 0000000000..9e1ae3ef37 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java @@ -0,0 +1,200 @@ +package com.sun.ts.tests.jms.core20.jmsconsumertests; + +import com.sun.ts.tests.jms.core20.jmsconsumertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.jmsconsumertests.Client { + static final String VEHICLE_ARCHIVE = "jmsconsumertests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsconsumertests_appclient_vehicle: + jmsconsumertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle: + jmsconsumertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsconsumertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsconsumertests_jsp_vehicle: + jmsconsumertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsconsumertests_servlet_vehicle: + jmsconsumertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmsconsumertests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmsconsumertests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmsconsumertests_servlet_vehicle_web.war"); + // The class files + jmsconsumertests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core20.jmsconsumertests.Client.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsconsumertests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmsconsumertests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsconsumertests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsconsumertests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmsconsumertests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmsconsumertests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsconsumertests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsconsumertests_servlet_vehicle_ear.addAsModule(jmsconsumertests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); + if(earResURL != null) { + jmsconsumertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsconsumertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsconsumertests_servlet_vehicle_ear, Client.class, earResURL); + return jmsconsumertests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueReceiveTests() throws java.lang.Exception { + super.queueReceiveTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueReceiveBodyTests() throws java.lang.Exception { + super.queueReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueReceiveBodyExceptionTests() throws java.lang.Exception { + super.queueReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueGetMessageSelectorTest() throws java.lang.Exception { + super.queueGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueCloseTest() throws java.lang.Exception { + super.queueCloseTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicReceiveTests() throws java.lang.Exception { + super.topicReceiveTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicReceiveBodyTests() throws java.lang.Exception { + super.topicReceiveBodyTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicReceiveBodyExceptionTests() throws java.lang.Exception { + super.topicReceiveBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicGetMessageSelectorTest() throws java.lang.Exception { + super.topicGetMessageSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicCloseTest() throws java.lang.Exception { + super.topicCloseTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java new file mode 100644 index 0000000000..40f853f9df --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java @@ -0,0 +1,202 @@ +package com.sun.ts.tests.jms.core20.jmscontextqueuetests; + +import com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmscontextqueuetests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontextqueuetests_appclient_vehicle: + jmscontextqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle: + jmscontextqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontextqueuetests_jsp_vehicle: + jmscontextqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontextqueuetests_servlet_vehicle: + jmscontextqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/jmscontextqueuetests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmscontextqueuetests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmscontextqueuetests_appclient_vehicle_client.jar"); + // The class files + jmscontextqueuetests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmscontextqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmscontextqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmscontextqueuetests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmscontextqueuetests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmscontextqueuetests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontextqueuetests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontextqueuetests_appclient_vehicle_ear.addAsModule(jmscontextqueuetests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); + if(earResURL != null) { + jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontextqueuetests_appclient_vehicle_ear, Client.class, earResURL); + return jmscontextqueuetests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getClientIDTest() throws java.lang.Exception { + super.getClientIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java new file mode 100644 index 0000000000..b4f2371672 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java @@ -0,0 +1,238 @@ +package com.sun.ts.tests.jms.core20.jmscontextqueuetests; + +import com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmscontextqueuetests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontextqueuetests_appclient_vehicle: + jmscontextqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle: + jmscontextqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontextqueuetests_jsp_vehicle: + jmscontextqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontextqueuetests_servlet_vehicle: + jmscontextqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/jmscontextqueuetests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmscontextqueuetests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmscontextqueuetests_ejb_vehicle_client.jar"); + // The class files + jmscontextqueuetests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + jmscontextqueuetests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmscontextqueuetests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmscontextqueuetests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmscontextqueuetests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jmscontextqueuetests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jmscontextqueuetests_ejb_vehicle_ejb.jar"); + // The class files + jmscontextqueuetests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + jmscontextqueuetests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jmscontextqueuetests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jmscontextqueuetests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jmscontextqueuetests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontextqueuetests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontextqueuetests_ejb_vehicle_ear.addAsModule(jmscontextqueuetests_ejb_vehicle_ejb); + jmscontextqueuetests_ejb_vehicle_ear.addAsModule(jmscontextqueuetests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); + if(earResURL != null) { + jmscontextqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontextqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontextqueuetests_ejb_vehicle_ear, Client.class, earResURL); + return jmscontextqueuetests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getClientIDTest() throws java.lang.Exception { + super.getClientIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java new file mode 100644 index 0000000000..9bae1be155 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java @@ -0,0 +1,221 @@ +package com.sun.ts.tests.jms.core20.jmscontextqueuetests; + +import com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmscontextqueuetests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontextqueuetests_appclient_vehicle: + jmscontextqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle: + jmscontextqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontextqueuetests_jsp_vehicle: + jmscontextqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontextqueuetests_servlet_vehicle: + jmscontextqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmscontextqueuetests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmscontextqueuetests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmscontextqueuetests_jsp_vehicle_web.war"); + // The class files + jmscontextqueuetests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmscontextqueuetests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmscontextqueuetests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmscontextqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmscontextqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + jmscontextqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + jmscontextqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmscontextqueuetests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmscontextqueuetests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontextqueuetests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontextqueuetests_jsp_vehicle_ear.addAsModule(jmscontextqueuetests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); + if(earResURL != null) { + jmscontextqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontextqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontextqueuetests_jsp_vehicle_ear, Client.class, earResURL); + return jmscontextqueuetests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getClientIDTest() throws java.lang.Exception { + super.getClientIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java new file mode 100644 index 0000000000..8c995ab10d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java @@ -0,0 +1,214 @@ +package com.sun.ts.tests.jms.core20.jmscontextqueuetests; + +import com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmscontextqueuetests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontextqueuetests_appclient_vehicle: + jmscontextqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle: + jmscontextqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontextqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontextqueuetests_jsp_vehicle: + jmscontextqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontextqueuetests_servlet_vehicle: + jmscontextqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmscontextqueuetests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmscontextqueuetests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmscontextqueuetests_servlet_vehicle_web.war"); + // The class files + jmscontextqueuetests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmscontextqueuetests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmscontextqueuetests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmscontextqueuetests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmscontextqueuetests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmscontextqueuetests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmscontextqueuetests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontextqueuetests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontextqueuetests_servlet_vehicle_ear.addAsModule(jmscontextqueuetests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); + if(earResURL != null) { + jmscontextqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontextqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontextqueuetests_servlet_vehicle_ear, Client.class, earResURL); + return jmscontextqueuetests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getClientIDTest() throws java.lang.Exception { + super.getClientIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java new file mode 100644 index 0000000000..7fe6124aef --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java @@ -0,0 +1,286 @@ +package com.sun.ts.tests.jms.core20.jmscontexttopictests; + +import com.sun.ts.tests.jms.core20.jmscontexttopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.jmscontexttopictests.Client { + static final String VEHICLE_ARCHIVE = "jmscontexttopictests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontexttopictests_appclient_vehicle: + jmscontexttopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle: + jmscontexttopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontexttopictests_jsp_vehicle: + jmscontexttopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontexttopictests_servlet_vehicle: + jmscontexttopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/jmscontexttopictests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmscontexttopictests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmscontexttopictests_appclient_vehicle_client.jar"); + // The class files + jmscontexttopictests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core20.jmscontexttopictests.Client.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmscontexttopictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmscontexttopictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmscontexttopictests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmscontexttopictests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmscontexttopictests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontexttopictests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontexttopictests_appclient_vehicle_ear.addAsModule(jmscontexttopictests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); + if(earResURL != null) { + jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontexttopictests_appclient_vehicle_ear, Client.class, earResURL); + return jmscontexttopictests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createDurableConsumerTest1() throws java.lang.Exception { + super.createDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createDurableConsumerTest2() throws java.lang.Exception { + super.createDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedDurableConsumerTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedDurableConsumerTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedDurableConsumerTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedConsumerTest1() throws java.lang.Exception { + super.createSharedConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedConsumerTest2() throws java.lang.Exception { + super.createSharedConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void simpleDurableConsumerTest() throws java.lang.Exception { + super.simpleDurableConsumerTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void inactiveDurableConsumerTopicRecTest() throws java.lang.Exception { + super.inactiveDurableConsumerTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableConsumerTopicNoLocalTest() throws java.lang.Exception { + super.durableConsumerTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableConsumerChangeSelectorTest() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void durableConsumerChangeSelectorTest2() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void verifyClientIDOnAdminConfiguredIDTest() throws java.lang.Exception { + super.verifyClientIDOnAdminConfiguredIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jMSRuntimeExceptionTests() throws java.lang.Exception { + super.jMSRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java new file mode 100644 index 0000000000..818e0fe7a0 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java @@ -0,0 +1,322 @@ +package com.sun.ts.tests.jms.core20.jmscontexttopictests; + +import com.sun.ts.tests.jms.core20.jmscontexttopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.jmscontexttopictests.Client { + static final String VEHICLE_ARCHIVE = "jmscontexttopictests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontexttopictests_appclient_vehicle: + jmscontexttopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle: + jmscontexttopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontexttopictests_jsp_vehicle: + jmscontexttopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontexttopictests_servlet_vehicle: + jmscontexttopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/jmscontexttopictests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmscontexttopictests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmscontexttopictests_ejb_vehicle_client.jar"); + // The class files + jmscontexttopictests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + jmscontexttopictests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmscontexttopictests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmscontexttopictests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmscontexttopictests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jmscontexttopictests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jmscontexttopictests_ejb_vehicle_ejb.jar"); + // The class files + jmscontexttopictests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core20.jmscontexttopictests.Client.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + jmscontexttopictests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jmscontexttopictests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jmscontexttopictests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jmscontexttopictests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontexttopictests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontexttopictests_ejb_vehicle_ear.addAsModule(jmscontexttopictests_ejb_vehicle_ejb); + jmscontexttopictests_ejb_vehicle_ear.addAsModule(jmscontexttopictests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); + if(earResURL != null) { + jmscontexttopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontexttopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontexttopictests_ejb_vehicle_ear, Client.class, earResURL); + return jmscontexttopictests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createDurableConsumerTest1() throws java.lang.Exception { + super.createDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createDurableConsumerTest2() throws java.lang.Exception { + super.createDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedDurableConsumerTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedDurableConsumerTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedDurableConsumerTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedConsumerTest1() throws java.lang.Exception { + super.createSharedConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedConsumerTest2() throws java.lang.Exception { + super.createSharedConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void simpleDurableConsumerTest() throws java.lang.Exception { + super.simpleDurableConsumerTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void inactiveDurableConsumerTopicRecTest() throws java.lang.Exception { + super.inactiveDurableConsumerTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableConsumerTopicNoLocalTest() throws java.lang.Exception { + super.durableConsumerTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableConsumerChangeSelectorTest() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void durableConsumerChangeSelectorTest2() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void verifyClientIDOnAdminConfiguredIDTest() throws java.lang.Exception { + super.verifyClientIDOnAdminConfiguredIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jMSRuntimeExceptionTests() throws java.lang.Exception { + super.jMSRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java new file mode 100644 index 0000000000..9caa512b49 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java @@ -0,0 +1,305 @@ +package com.sun.ts.tests.jms.core20.jmscontexttopictests; + +import com.sun.ts.tests.jms.core20.jmscontexttopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.jmscontexttopictests.Client { + static final String VEHICLE_ARCHIVE = "jmscontexttopictests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontexttopictests_appclient_vehicle: + jmscontexttopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle: + jmscontexttopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontexttopictests_jsp_vehicle: + jmscontexttopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontexttopictests_servlet_vehicle: + jmscontexttopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmscontexttopictests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmscontexttopictests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmscontexttopictests_jsp_vehicle_web.war"); + // The class files + jmscontexttopictests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core20.jmscontexttopictests.Client.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmscontexttopictests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmscontexttopictests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmscontexttopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmscontexttopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + jmscontexttopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + jmscontexttopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmscontexttopictests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmscontexttopictests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontexttopictests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontexttopictests_jsp_vehicle_ear.addAsModule(jmscontexttopictests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); + if(earResURL != null) { + jmscontexttopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontexttopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontexttopictests_jsp_vehicle_ear, Client.class, earResURL); + return jmscontexttopictests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createDurableConsumerTest1() throws java.lang.Exception { + super.createDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createDurableConsumerTest2() throws java.lang.Exception { + super.createDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedDurableConsumerTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedDurableConsumerTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedDurableConsumerTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedConsumerTest1() throws java.lang.Exception { + super.createSharedConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedConsumerTest2() throws java.lang.Exception { + super.createSharedConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void simpleDurableConsumerTest() throws java.lang.Exception { + super.simpleDurableConsumerTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void inactiveDurableConsumerTopicRecTest() throws java.lang.Exception { + super.inactiveDurableConsumerTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableConsumerTopicNoLocalTest() throws java.lang.Exception { + super.durableConsumerTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableConsumerChangeSelectorTest() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void durableConsumerChangeSelectorTest2() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void verifyClientIDOnAdminConfiguredIDTest() throws java.lang.Exception { + super.verifyClientIDOnAdminConfiguredIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jMSRuntimeExceptionTests() throws java.lang.Exception { + super.jMSRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java new file mode 100644 index 0000000000..7eabd21ea4 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java @@ -0,0 +1,298 @@ +package com.sun.ts.tests.jms.core20.jmscontexttopictests; + +import com.sun.ts.tests.jms.core20.jmscontexttopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.jmscontexttopictests.Client { + static final String VEHICLE_ARCHIVE = "jmscontexttopictests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + jmscontexttopictests_appclient_vehicle: + jmscontexttopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle: + jmscontexttopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmscontexttopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmscontexttopictests_jsp_vehicle: + jmscontexttopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmscontexttopictests_servlet_vehicle: + jmscontexttopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmscontexttopictests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmscontexttopictests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmscontexttopictests_servlet_vehicle_web.war"); + // The class files + jmscontexttopictests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.core20.jmscontexttopictests.Client.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmscontexttopictests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmscontexttopictests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmscontexttopictests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmscontexttopictests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmscontexttopictests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmscontexttopictests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmscontexttopictests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmscontexttopictests_servlet_vehicle_ear.addAsModule(jmscontexttopictests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); + if(earResURL != null) { + jmscontexttopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmscontexttopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmscontexttopictests_servlet_vehicle_ear, Client.class, earResURL); + return jmscontexttopictests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getMetaDataTest() throws java.lang.Exception { + super.getMetaDataTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getSessionModeTest() throws java.lang.Exception { + super.getSessionModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getTransactedTest() throws java.lang.Exception { + super.getTransactedTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetAutoStartTest() throws java.lang.Exception { + super.setGetAutoStartTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createConsumerTest() throws java.lang.Exception { + super.createConsumerTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createDurableConsumerTest1() throws java.lang.Exception { + super.createDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createDurableConsumerTest2() throws java.lang.Exception { + super.createDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedDurableConsumerTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedDurableConsumerTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedDurableConsumerTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedConsumerTest1() throws java.lang.Exception { + super.createSharedConsumerTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedConsumerTest2() throws java.lang.Exception { + super.createSharedConsumerTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void multipleCloseContextTest() throws java.lang.Exception { + super.multipleCloseContextTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void simpleDurableConsumerTest() throws java.lang.Exception { + super.simpleDurableConsumerTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void inactiveDurableConsumerTopicRecTest() throws java.lang.Exception { + super.inactiveDurableConsumerTopicRecTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableConsumerTopicNoLocalTest() throws java.lang.Exception { + super.durableConsumerTopicNoLocalTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableConsumerChangeSelectorTest() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void durableConsumerChangeSelectorTest2() throws java.lang.Exception { + super.durableConsumerChangeSelectorTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void verifyClientIDOnAdminConfiguredIDTest() throws java.lang.Exception { + super.verifyClientIDOnAdminConfiguredIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidDestinationRuntimeExceptionTests() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidSelectorRuntimeExceptionTests() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jMSRuntimeExceptionTests() throws java.lang.Exception { + super.jMSRuntimeExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void illegalStateRuntimeExceptionTest() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java new file mode 100644 index 0000000000..552e6219fa --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java @@ -0,0 +1,328 @@ +package com.sun.ts.tests.jms.core20.jmsproducerqueuetests; + +import com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducerqueuetests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducerqueuetests_appclient_vehicle: + jmsproducerqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle: + jmsproducerqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducerqueuetests_jsp_vehicle: + jmsproducerqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducerqueuetests_servlet_vehicle: + jmsproducerqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/jmsproducerqueuetests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsproducerqueuetests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsproducerqueuetests_appclient_vehicle_client.jar"); + // The class files + jmsproducerqueuetests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmsproducerqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsproducerqueuetests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsproducerqueuetests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsproducerqueuetests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmsproducerqueuetests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducerqueuetests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducerqueuetests_appclient_vehicle_ear.addAsModule(jmsproducerqueuetests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); + if(earResURL != null) { + jmsproducerqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducerqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducerqueuetests_appclient_vehicle_ear, Client.class, earResURL); + return jmsproducerqueuetests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java new file mode 100644 index 0000000000..d5e2f4601a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java @@ -0,0 +1,364 @@ +package com.sun.ts.tests.jms.core20.jmsproducerqueuetests; + +import com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducerqueuetests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducerqueuetests_appclient_vehicle: + jmsproducerqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle: + jmsproducerqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducerqueuetests_jsp_vehicle: + jmsproducerqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducerqueuetests_servlet_vehicle: + jmsproducerqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsproducerqueuetests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsproducerqueuetests_ejb_vehicle_client.jar"); + // The class files + jmsproducerqueuetests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + jmsproducerqueuetests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsproducerqueuetests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsproducerqueuetests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsproducerqueuetests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jmsproducerqueuetests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jmsproducerqueuetests_ejb_vehicle_ejb.jar"); + // The class files + jmsproducerqueuetests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + jmsproducerqueuetests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jmsproducerqueuetests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jmsproducerqueuetests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jmsproducerqueuetests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducerqueuetests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducerqueuetests_ejb_vehicle_ear.addAsModule(jmsproducerqueuetests_ejb_vehicle_ejb); + jmsproducerqueuetests_ejb_vehicle_ear.addAsModule(jmsproducerqueuetests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); + if(earResURL != null) { + jmsproducerqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducerqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducerqueuetests_ejb_vehicle_ear, Client.class, earResURL); + return jmsproducerqueuetests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java new file mode 100644 index 0000000000..e9ea4713eb --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java @@ -0,0 +1,347 @@ +package com.sun.ts.tests.jms.core20.jmsproducerqueuetests; + +import com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducerqueuetests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducerqueuetests_appclient_vehicle: + jmsproducerqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle: + jmsproducerqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducerqueuetests_jsp_vehicle: + jmsproducerqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducerqueuetests_servlet_vehicle: + jmsproducerqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmsproducerqueuetests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmsproducerqueuetests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmsproducerqueuetests_jsp_vehicle_web.war"); + // The class files + jmsproducerqueuetests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + jmsproducerqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + jmsproducerqueuetests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmsproducerqueuetests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmsproducerqueuetests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducerqueuetests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducerqueuetests_jsp_vehicle_ear.addAsModule(jmsproducerqueuetests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); + if(earResURL != null) { + jmsproducerqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducerqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducerqueuetests_jsp_vehicle_ear, Client.class, earResURL); + return jmsproducerqueuetests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java new file mode 100644 index 0000000000..90df406388 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java @@ -0,0 +1,340 @@ +package com.sun.ts.tests.jms.core20.jmsproducerqueuetests; + +import com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducerqueuetests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducerqueuetests_appclient_vehicle: + jmsproducerqueuetests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle: + jmsproducerqueuetests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducerqueuetests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducerqueuetests_jsp_vehicle: + jmsproducerqueuetests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducerqueuetests_servlet_vehicle: + jmsproducerqueuetests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmsproducerqueuetests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmsproducerqueuetests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmsproducerqueuetests_servlet_vehicle_web.war"); + // The class files + jmsproducerqueuetests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsproducerqueuetests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmsproducerqueuetests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmsproducerqueuetests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducerqueuetests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducerqueuetests_servlet_vehicle_ear.addAsModule(jmsproducerqueuetests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); + if(earResURL != null) { + jmsproducerqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducerqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducerqueuetests_servlet_vehicle_ear, Client.class, earResURL); + return jmsproducerqueuetests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java new file mode 100644 index 0000000000..ce2e17cedc --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java @@ -0,0 +1,328 @@ +package com.sun.ts.tests.jms.core20.jmsproducertopictests; + +import com.sun.ts.tests.jms.core20.jmsproducertopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.jmsproducertopictests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducertopictests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducertopictests_appclient_vehicle: + jmsproducertopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle: + jmsproducertopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducertopictests_jsp_vehicle: + jmsproducertopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducertopictests_servlet_vehicle: + jmsproducertopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/jmsproducertopictests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsproducertopictests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsproducertopictests_appclient_vehicle_client.jar"); + // The class files + jmsproducertopictests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmsproducertopictests.Client.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + jmsproducertopictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsproducertopictests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsproducertopictests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsproducertopictests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive jmsproducertopictests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducertopictests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducertopictests_appclient_vehicle_ear.addAsModule(jmsproducertopictests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); + if(earResURL != null) { + jmsproducertopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducertopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducertopictests_appclient_vehicle_ear, Client.class, earResURL); + return jmsproducertopictests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java new file mode 100644 index 0000000000..dc69c936ab --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java @@ -0,0 +1,364 @@ +package com.sun.ts.tests.jms.core20.jmsproducertopictests; + +import com.sun.ts.tests.jms.core20.jmsproducertopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.jmsproducertopictests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducertopictests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducertopictests_appclient_vehicle: + jmsproducertopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle: + jmsproducertopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducertopictests_jsp_vehicle: + jmsproducertopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducertopictests_servlet_vehicle: + jmsproducertopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/jmsproducertopictests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jmsproducertopictests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jmsproducertopictests_ejb_vehicle_client.jar"); + // The class files + jmsproducertopictests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + jmsproducertopictests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + jmsproducertopictests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + jmsproducertopictests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jmsproducertopictests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jmsproducertopictests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jmsproducertopictests_ejb_vehicle_ejb.jar"); + // The class files + jmsproducertopictests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmsproducertopictests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + jmsproducertopictests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jmsproducertopictests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jmsproducertopictests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jmsproducertopictests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducertopictests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducertopictests_ejb_vehicle_ear.addAsModule(jmsproducertopictests_ejb_vehicle_ejb); + jmsproducertopictests_ejb_vehicle_ear.addAsModule(jmsproducertopictests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); + if(earResURL != null) { + jmsproducertopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducertopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducertopictests_ejb_vehicle_ear, Client.class, earResURL); + return jmsproducertopictests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java new file mode 100644 index 0000000000..d19513f2f8 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java @@ -0,0 +1,347 @@ +package com.sun.ts.tests.jms.core20.jmsproducertopictests; + +import com.sun.ts.tests.jms.core20.jmsproducertopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.jmsproducertopictests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducertopictests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducertopictests_appclient_vehicle: + jmsproducertopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle: + jmsproducertopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducertopictests_jsp_vehicle: + jmsproducertopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducertopictests_servlet_vehicle: + jmsproducertopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmsproducertopictests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmsproducertopictests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmsproducertopictests_jsp_vehicle_web.war"); + // The class files + jmsproducertopictests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmsproducertopictests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsproducertopictests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmsproducertopictests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsproducertopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/jsp_vehicle_web.xml"); + if(warResURL != null) { + jmsproducertopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + jmsproducertopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + jmsproducertopictests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmsproducertopictests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmsproducertopictests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducertopictests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducertopictests_jsp_vehicle_ear.addAsModule(jmsproducertopictests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); + if(earResURL != null) { + jmsproducertopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducertopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducertopictests_jsp_vehicle_ear, Client.class, earResURL); + return jmsproducertopictests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java new file mode 100644 index 0000000000..8fd6bcef13 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java @@ -0,0 +1,340 @@ +package com.sun.ts.tests.jms.core20.jmsproducertopictests; + +import com.sun.ts.tests.jms.core20.jmsproducertopictests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.jmsproducertopictests.Client { + static final String VEHICLE_ARCHIVE = "jmsproducertopictests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + jmsproducertopictests_appclient_vehicle: + jmsproducertopictests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle: + jmsproducertopictests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + jmsproducertopictests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + jmsproducertopictests_jsp_vehicle: + jmsproducertopictests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + jmsproducertopictests_servlet_vehicle: + jmsproducertopictests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/jmsproducertopictests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive jmsproducertopictests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jmsproducertopictests_servlet_vehicle_web.war"); + // The class files + jmsproducertopictests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.jmsproducertopictests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsproducertopictests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + jmsproducertopictests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsproducertopictests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/servlet_vehicle_web.xml"); + if(warResURL != null) { + jmsproducertopictests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(jmsproducertopictests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive jmsproducertopictests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jmsproducertopictests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jmsproducertopictests_servlet_vehicle_ear.addAsModule(jmsproducertopictests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); + if(earResURL != null) { + jmsproducertopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + if(earResURL != null) { + jmsproducertopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jmsproducertopictests_servlet_vehicle_ear, Client.class, earResURL); + return jmsproducertopictests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest1() throws java.lang.Exception { + super.sendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest2() throws java.lang.Exception { + super.sendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest3() throws java.lang.Exception { + super.sendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest4() throws java.lang.Exception { + super.sendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTest5() throws java.lang.Exception { + super.sendAndRecvTest5(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvMsgsOfEachMsgTypeTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDeliveryModeTest() throws java.lang.Exception { + super.setGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDeliveryDelayTest() throws java.lang.Exception { + super.setGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDisableMessageIDTest() throws java.lang.Exception { + super.setGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetDisableMessageTimestampTest() throws java.lang.Exception { + super.setGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetPriorityTest() throws java.lang.Exception { + super.setGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetTimeToLiveTest() throws java.lang.Exception { + super.setGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void deliveryDelayTest() throws java.lang.Exception { + super.deliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrMessageIDTest() throws java.lang.Exception { + super.msgHdrMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgHdrJMSDeliveryTimeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryTimeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetAllPropertyTypesTest() throws java.lang.Exception { + super.setGetAllPropertyTypesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setGetAllHeaderTypesTest() throws java.lang.Exception { + super.setGetAllHeaderTypesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesTest() throws java.lang.Exception { + super.msgPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertiesConversionTests() throws java.lang.Exception { + super.msgPropertiesConversionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgPropertyExistTest() throws java.lang.Exception { + super.msgPropertyExistTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void msgJMSXPropertiesTest() throws java.lang.Exception { + super.msgJMSXPropertiesTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void setPropertyExceptionTests() throws java.lang.Exception { + super.setPropertyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendExceptionTests() throws java.lang.Exception { + super.sendExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getBodyTests() throws java.lang.Exception { + super.getBodyTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getBodyExceptionTests() throws java.lang.Exception { + super.getBodyExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void isBodyAssignableToTest() throws java.lang.Exception { + super.isBodyAssignableToTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/Client.java index 817b52ac14..05fa669ba6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/Client.java @@ -2322,7 +2322,7 @@ public void JMSExceptionTests() throws Exception { } } - private static class MyCompletionListener implements CompletionListener { + public static class MyCompletionListener implements CompletionListener { public MyCompletionListener() { TestUtil.logMsg("MyCompletionListener()"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java new file mode 100644 index 0000000000..b669d7bbdd --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java @@ -0,0 +1,294 @@ +package com.sun.ts.tests.jms.core20.messageproducertests; + +import com.sun.ts.tests.jms.core20.messageproducertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.messageproducertests.Client { + static final String VEHICLE_ARCHIVE = "messageproducertests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + messageproducertests_appclient_vehicle: + messageproducertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle: + messageproducertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageproducertests_jsp_vehicle: + messageproducertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageproducertests_servlet_vehicle: + messageproducertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/messageproducertests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive messageproducertests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "messageproducertests_appclient_vehicle_client.jar"); + // The class files + messageproducertests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.MyCompletionListener.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + messageproducertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + messageproducertests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + messageproducertests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(messageproducertests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive messageproducertests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageproducertests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageproducertests_appclient_vehicle_ear.addAsModule(messageproducertests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); + if(earResURL != null) { + messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + if(earResURL != null) { + messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageproducertests_appclient_vehicle_ear, Client.class, earResURL); + return messageproducertests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendAndRecvTest1() throws java.lang.Exception { + super.queueSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendAndRecvTest2() throws java.lang.Exception { + super.queueSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendAndRecvTest3() throws java.lang.Exception { + super.queueSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSendAndRecvTest4() throws java.lang.Exception { + super.queueSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSetGetDeliveryModeTest() throws java.lang.Exception { + super.queueSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSetGetDeliveryDelayTest() throws java.lang.Exception { + super.queueSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSetGetDisableMessageIDTest() throws java.lang.Exception { + super.queueSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.queueSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSetGetPriorityTest() throws java.lang.Exception { + super.queueSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueSetGetTimeToLiveTest() throws java.lang.Exception { + super.queueSetGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueInvalidDestinationExceptionTests() throws java.lang.Exception { + super.queueInvalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.queueUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void queueDeliveryDelayTest() throws java.lang.Exception { + super.queueDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendAndRecvTest1() throws java.lang.Exception { + super.topicSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendAndRecvTest2() throws java.lang.Exception { + super.topicSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendAndRecvTest3() throws java.lang.Exception { + super.topicSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSendAndRecvTest4() throws java.lang.Exception { + super.topicSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSetGetDeliveryModeTest() throws java.lang.Exception { + super.topicSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSetGetDeliveryDelayTest() throws java.lang.Exception { + super.topicSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSetGetDisableMessageIDTest() throws java.lang.Exception { + super.topicSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.topicSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicSetGetPriorityTest() throws java.lang.Exception { + super.topicSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.topicUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void topicDeliveryDelayTest() throws java.lang.Exception { + super.topicDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void JMSExceptionTests() throws java.lang.Exception { + super.JMSExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java new file mode 100644 index 0000000000..7ec48fa459 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java @@ -0,0 +1,330 @@ +package com.sun.ts.tests.jms.core20.messageproducertests; + +import com.sun.ts.tests.jms.core20.messageproducertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.messageproducertests.Client { + static final String VEHICLE_ARCHIVE = "messageproducertests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + messageproducertests_appclient_vehicle: + messageproducertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle: + messageproducertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageproducertests_jsp_vehicle: + messageproducertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageproducertests_servlet_vehicle: + messageproducertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/messageproducertests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive messageproducertests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "messageproducertests_ejb_vehicle_client.jar"); + // The class files + messageproducertests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + messageproducertests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + messageproducertests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + messageproducertests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(messageproducertests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive messageproducertests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "messageproducertests_ejb_vehicle_ejb.jar"); + // The class files + messageproducertests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.MyCompletionListener.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + messageproducertests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + messageproducertests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(messageproducertests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive messageproducertests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageproducertests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageproducertests_ejb_vehicle_ear.addAsModule(messageproducertests_ejb_vehicle_ejb); + messageproducertests_ejb_vehicle_ear.addAsModule(messageproducertests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); + if(earResURL != null) { + messageproducertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + if(earResURL != null) { + messageproducertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageproducertests_ejb_vehicle_ear, Client.class, earResURL); + return messageproducertests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSendAndRecvTest1() throws java.lang.Exception { + super.queueSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSendAndRecvTest2() throws java.lang.Exception { + super.queueSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSendAndRecvTest3() throws java.lang.Exception { + super.queueSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSendAndRecvTest4() throws java.lang.Exception { + super.queueSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSetGetDeliveryModeTest() throws java.lang.Exception { + super.queueSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSetGetDeliveryDelayTest() throws java.lang.Exception { + super.queueSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSetGetDisableMessageIDTest() throws java.lang.Exception { + super.queueSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.queueSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSetGetPriorityTest() throws java.lang.Exception { + super.queueSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueSetGetTimeToLiveTest() throws java.lang.Exception { + super.queueSetGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueInvalidDestinationExceptionTests() throws java.lang.Exception { + super.queueInvalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.queueUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void queueDeliveryDelayTest() throws java.lang.Exception { + super.queueDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSendAndRecvTest1() throws java.lang.Exception { + super.topicSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSendAndRecvTest2() throws java.lang.Exception { + super.topicSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSendAndRecvTest3() throws java.lang.Exception { + super.topicSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSendAndRecvTest4() throws java.lang.Exception { + super.topicSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSetGetDeliveryModeTest() throws java.lang.Exception { + super.topicSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSetGetDeliveryDelayTest() throws java.lang.Exception { + super.topicSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSetGetDisableMessageIDTest() throws java.lang.Exception { + super.topicSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.topicSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicSetGetPriorityTest() throws java.lang.Exception { + super.topicSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.topicUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void topicDeliveryDelayTest() throws java.lang.Exception { + super.topicDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void JMSExceptionTests() throws java.lang.Exception { + super.JMSExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java new file mode 100644 index 0000000000..7ea47f4588 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java @@ -0,0 +1,313 @@ +package com.sun.ts.tests.jms.core20.messageproducertests; + +import com.sun.ts.tests.jms.core20.messageproducertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.messageproducertests.Client { + static final String VEHICLE_ARCHIVE = "messageproducertests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + messageproducertests_appclient_vehicle: + messageproducertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle: + messageproducertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageproducertests_jsp_vehicle: + messageproducertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageproducertests_servlet_vehicle: + messageproducertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/messageproducertests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive messageproducertests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "messageproducertests_jsp_vehicle_web.war"); + // The class files + messageproducertests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.MyCompletionListener.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + messageproducertests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + messageproducertests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/jsp_vehicle_web.xml"); + if(warResURL != null) { + messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(messageproducertests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive messageproducertests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageproducertests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageproducertests_jsp_vehicle_ear.addAsModule(messageproducertests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); + if(earResURL != null) { + messageproducertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + if(earResURL != null) { + messageproducertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageproducertests_jsp_vehicle_ear, Client.class, earResURL); + return messageproducertests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSendAndRecvTest1() throws java.lang.Exception { + super.queueSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSendAndRecvTest2() throws java.lang.Exception { + super.queueSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSendAndRecvTest3() throws java.lang.Exception { + super.queueSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSendAndRecvTest4() throws java.lang.Exception { + super.queueSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSetGetDeliveryModeTest() throws java.lang.Exception { + super.queueSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSetGetDeliveryDelayTest() throws java.lang.Exception { + super.queueSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSetGetDisableMessageIDTest() throws java.lang.Exception { + super.queueSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.queueSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSetGetPriorityTest() throws java.lang.Exception { + super.queueSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueSetGetTimeToLiveTest() throws java.lang.Exception { + super.queueSetGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueInvalidDestinationExceptionTests() throws java.lang.Exception { + super.queueInvalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.queueUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void queueDeliveryDelayTest() throws java.lang.Exception { + super.queueDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSendAndRecvTest1() throws java.lang.Exception { + super.topicSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSendAndRecvTest2() throws java.lang.Exception { + super.topicSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSendAndRecvTest3() throws java.lang.Exception { + super.topicSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSendAndRecvTest4() throws java.lang.Exception { + super.topicSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSetGetDeliveryModeTest() throws java.lang.Exception { + super.topicSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSetGetDeliveryDelayTest() throws java.lang.Exception { + super.topicSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSetGetDisableMessageIDTest() throws java.lang.Exception { + super.topicSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.topicSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicSetGetPriorityTest() throws java.lang.Exception { + super.topicSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.topicUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void topicDeliveryDelayTest() throws java.lang.Exception { + super.topicDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void JMSExceptionTests() throws java.lang.Exception { + super.JMSExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java new file mode 100644 index 0000000000..29d3d3a982 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java @@ -0,0 +1,306 @@ +package com.sun.ts.tests.jms.core20.messageproducertests; + +import com.sun.ts.tests.jms.core20.messageproducertests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.messageproducertests.Client { + static final String VEHICLE_ARCHIVE = "messageproducertests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + messageproducertests_appclient_vehicle: + messageproducertests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle: + messageproducertests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + messageproducertests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + messageproducertests_jsp_vehicle: + messageproducertests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + messageproducertests_servlet_vehicle: + messageproducertests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/messageproducertests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive messageproducertests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "messageproducertests_servlet_vehicle_web.war"); + // The class files + messageproducertests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.class, + com.sun.ts.tests.jms.core20.messageproducertests.Client.MyCompletionListener.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + messageproducertests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + messageproducertests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + messageproducertests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/servlet_vehicle_web.xml"); + if(warResURL != null) { + messageproducertests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(messageproducertests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive messageproducertests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "messageproducertests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + messageproducertests_servlet_vehicle_ear.addAsModule(messageproducertests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); + if(earResURL != null) { + messageproducertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + if(earResURL != null) { + messageproducertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(messageproducertests_servlet_vehicle_ear, Client.class, earResURL); + return messageproducertests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSendAndRecvTest1() throws java.lang.Exception { + super.queueSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSendAndRecvTest2() throws java.lang.Exception { + super.queueSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSendAndRecvTest3() throws java.lang.Exception { + super.queueSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSendAndRecvTest4() throws java.lang.Exception { + super.queueSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSetGetDeliveryModeTest() throws java.lang.Exception { + super.queueSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSetGetDeliveryDelayTest() throws java.lang.Exception { + super.queueSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSetGetDisableMessageIDTest() throws java.lang.Exception { + super.queueSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.queueSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSetGetPriorityTest() throws java.lang.Exception { + super.queueSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueSetGetTimeToLiveTest() throws java.lang.Exception { + super.queueSetGetTimeToLiveTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueInvalidDestinationExceptionTests() throws java.lang.Exception { + super.queueInvalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.queueUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void queueDeliveryDelayTest() throws java.lang.Exception { + super.queueDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSendAndRecvTest1() throws java.lang.Exception { + super.topicSendAndRecvTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSendAndRecvTest2() throws java.lang.Exception { + super.topicSendAndRecvTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSendAndRecvTest3() throws java.lang.Exception { + super.topicSendAndRecvTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSendAndRecvTest4() throws java.lang.Exception { + super.topicSendAndRecvTest4(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSetGetDeliveryModeTest() throws java.lang.Exception { + super.topicSetGetDeliveryModeTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSetGetDeliveryDelayTest() throws java.lang.Exception { + super.topicSetGetDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSetGetDisableMessageIDTest() throws java.lang.Exception { + super.topicSetGetDisableMessageIDTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSetGetDisableMessageTimestampTest() throws java.lang.Exception { + super.topicSetGetDisableMessageTimestampTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicSetGetPriorityTest() throws java.lang.Exception { + super.topicSetGetPriorityTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicUnsupportedOperationExceptionTests() throws java.lang.Exception { + super.topicUnsupportedOperationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void topicDeliveryDelayTest() throws java.lang.Exception { + super.topicDeliveryDelayTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void JMSExceptionTests() throws java.lang.Exception { + super.JMSExceptionTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java new file mode 100644 index 0000000000..a150f88b22 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java @@ -0,0 +1,347 @@ +package com.sun.ts.tests.jms.core20.runtimeexceptiontests; + +import com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client { + static final String VEHICLE_ARCHIVE = "runtimeexceptiontests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + runtimeexceptiontests_appclient_vehicle: + runtimeexceptiontests_appclient_vehicle_client: META-INF/application-client.xml + runtimeexceptiontests_ejb_vehicle: + runtimeexceptiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + runtimeexceptiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + runtimeexceptiontests_jsp_vehicle: + runtimeexceptiontests_jsp_vehicle_web: WEB-INF/web.xml + runtimeexceptiontests_servlet_vehicle: + runtimeexceptiontests_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive runtimeexceptiontests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "runtimeexceptiontests_appclient_vehicle_client.jar"); + // The class files + runtimeexceptiontests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + runtimeexceptiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + runtimeexceptiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + runtimeexceptiontests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(runtimeexceptiontests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive runtimeexceptiontests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "runtimeexceptiontests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + runtimeexceptiontests_appclient_vehicle_ear.addAsModule(runtimeexceptiontests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); + if(earResURL != null) { + runtimeexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + if(earResURL != null) { + runtimeexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(runtimeexceptiontests_appclient_vehicle_ear, Client.class, earResURL); + return runtimeexceptiontests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRolledBackRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRolledBackRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionRolledBackRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionInProgressRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionInProgressRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void transactionInProgressRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void resourceAllocationRuntimeExceptionTest1() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void resourceAllocationRuntimeExceptionTest2() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void resourceAllocationRuntimeExceptionTest3() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageNotWriteableRuntimeExceptionTest1() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageNotWriteableRuntimeExceptionTest2() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageNotWriteableRuntimeExceptionTest3() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageFormatRuntimeExceptionTest1() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageFormatRuntimeExceptionTest2() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void messageFormatRuntimeExceptionTest3() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jmsSecurityRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jmsSecurityRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jmsSecurityRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jmsRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jmsRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jmsRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidSelectorRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidSelectorRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidSelectorRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidClientIDRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidClientIDRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidClientIDRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateRuntimeExceptionTest1() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateRuntimeExceptionTest2() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateRuntimeExceptionTest3() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest3(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java new file mode 100644 index 0000000000..2d655c03e1 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java @@ -0,0 +1,382 @@ +package com.sun.ts.tests.jms.core20.runtimeexceptiontests; + +import com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client { + static final String VEHICLE_ARCHIVE = "runtimeexceptiontests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + runtimeexceptiontests_appclient_vehicle: + runtimeexceptiontests_appclient_vehicle_client: META-INF/application-client.xml + runtimeexceptiontests_ejb_vehicle: + runtimeexceptiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + runtimeexceptiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + runtimeexceptiontests_jsp_vehicle: + runtimeexceptiontests_jsp_vehicle_web: WEB-INF/web.xml + runtimeexceptiontests_servlet_vehicle: + runtimeexceptiontests_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive runtimeexceptiontests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "runtimeexceptiontests_ejb_vehicle_client.jar"); + // The class files + runtimeexceptiontests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + runtimeexceptiontests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + runtimeexceptiontests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + runtimeexceptiontests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(runtimeexceptiontests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive runtimeexceptiontests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "runtimeexceptiontests_ejb_vehicle_ejb.jar"); + // The class files + runtimeexceptiontests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class, + com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + runtimeexceptiontests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + runtimeexceptiontests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(runtimeexceptiontests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive runtimeexceptiontests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "runtimeexceptiontests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + runtimeexceptiontests_ejb_vehicle_ear.addAsModule(runtimeexceptiontests_ejb_vehicle_ejb); + runtimeexceptiontests_ejb_vehicle_ear.addAsModule(runtimeexceptiontests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); + if(earResURL != null) { + runtimeexceptiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + if(earResURL != null) { + runtimeexceptiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(runtimeexceptiontests_ejb_vehicle_ear, Client.class, earResURL); + return runtimeexceptiontests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void transactionRolledBackRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void transactionRolledBackRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void transactionRolledBackRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void transactionInProgressRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void transactionInProgressRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void transactionInProgressRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void resourceAllocationRuntimeExceptionTest1() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void resourceAllocationRuntimeExceptionTest2() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void resourceAllocationRuntimeExceptionTest3() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageNotWriteableRuntimeExceptionTest1() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageNotWriteableRuntimeExceptionTest2() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageNotWriteableRuntimeExceptionTest3() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageFormatRuntimeExceptionTest1() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageFormatRuntimeExceptionTest2() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void messageFormatRuntimeExceptionTest3() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jmsSecurityRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jmsSecurityRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jmsSecurityRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jmsRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jmsRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jmsRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidSelectorRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidSelectorRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidSelectorRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidDestinationRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidDestinationRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidDestinationRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidClientIDRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidClientIDRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidClientIDRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void illegalStateRuntimeExceptionTest1() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void illegalStateRuntimeExceptionTest2() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void illegalStateRuntimeExceptionTest3() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest3(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java new file mode 100644 index 0000000000..e70d5e5fab --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java @@ -0,0 +1,362 @@ +package com.sun.ts.tests.jms.core20.runtimeexceptiontests; + +import com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client { + static final String VEHICLE_ARCHIVE = "runtimeexceptiontests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + runtimeexceptiontests_appclient_vehicle: + runtimeexceptiontests_appclient_vehicle_client: META-INF/application-client.xml + runtimeexceptiontests_ejb_vehicle: + runtimeexceptiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + runtimeexceptiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + runtimeexceptiontests_jsp_vehicle: + runtimeexceptiontests_jsp_vehicle_web: WEB-INF/web.xml + runtimeexceptiontests_servlet_vehicle: + runtimeexceptiontests_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive runtimeexceptiontests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "runtimeexceptiontests_jsp_vehicle_web.war"); + // The class files + runtimeexceptiontests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + runtimeexceptiontests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + runtimeexceptiontests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + runtimeexceptiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + runtimeexceptiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + runtimeexceptiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(runtimeexceptiontests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive runtimeexceptiontests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "runtimeexceptiontests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + runtimeexceptiontests_jsp_vehicle_ear.addAsModule(runtimeexceptiontests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); + if(earResURL != null) { + runtimeexceptiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + if(earResURL != null) { + runtimeexceptiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(runtimeexceptiontests_jsp_vehicle_ear, Client.class, earResURL); + return runtimeexceptiontests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void transactionRolledBackRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void transactionRolledBackRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void transactionRolledBackRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void transactionInProgressRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void transactionInProgressRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void transactionInProgressRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void resourceAllocationRuntimeExceptionTest1() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void resourceAllocationRuntimeExceptionTest2() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void resourceAllocationRuntimeExceptionTest3() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageNotWriteableRuntimeExceptionTest1() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageNotWriteableRuntimeExceptionTest2() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageNotWriteableRuntimeExceptionTest3() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageFormatRuntimeExceptionTest1() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageFormatRuntimeExceptionTest2() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void messageFormatRuntimeExceptionTest3() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jmsSecurityRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jmsSecurityRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jmsSecurityRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jmsRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jmsRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jmsRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidSelectorRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidSelectorRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidSelectorRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidDestinationRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidDestinationRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidDestinationRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidClientIDRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidClientIDRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidClientIDRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void illegalStateRuntimeExceptionTest1() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void illegalStateRuntimeExceptionTest2() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void illegalStateRuntimeExceptionTest3() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest3(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java new file mode 100644 index 0000000000..e84e8eb29e --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java @@ -0,0 +1,355 @@ +package com.sun.ts.tests.jms.core20.runtimeexceptiontests; + +import com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client { + static final String VEHICLE_ARCHIVE = "runtimeexceptiontests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + runtimeexceptiontests_appclient_vehicle: + runtimeexceptiontests_appclient_vehicle_client: META-INF/application-client.xml + runtimeexceptiontests_ejb_vehicle: + runtimeexceptiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + runtimeexceptiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + runtimeexceptiontests_jsp_vehicle: + runtimeexceptiontests_jsp_vehicle_web: WEB-INF/web.xml + runtimeexceptiontests_servlet_vehicle: + runtimeexceptiontests_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive runtimeexceptiontests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "runtimeexceptiontests_servlet_vehicle_web.war"); + // The class files + runtimeexceptiontests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + runtimeexceptiontests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + runtimeexceptiontests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + runtimeexceptiontests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(runtimeexceptiontests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive runtimeexceptiontests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "runtimeexceptiontests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + runtimeexceptiontests_servlet_vehicle_ear.addAsModule(runtimeexceptiontests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); + if(earResURL != null) { + runtimeexceptiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + if(earResURL != null) { + runtimeexceptiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(runtimeexceptiontests_servlet_vehicle_ear, Client.class, earResURL); + return runtimeexceptiontests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void transactionRolledBackRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void transactionRolledBackRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void transactionRolledBackRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionRolledBackRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void transactionInProgressRuntimeExceptionTest1() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void transactionInProgressRuntimeExceptionTest2() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void transactionInProgressRuntimeExceptionTest3() throws java.lang.Exception { + super.transactionInProgressRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void resourceAllocationRuntimeExceptionTest1() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void resourceAllocationRuntimeExceptionTest2() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void resourceAllocationRuntimeExceptionTest3() throws java.lang.Exception { + super.resourceAllocationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageNotWriteableRuntimeExceptionTest1() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageNotWriteableRuntimeExceptionTest2() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageNotWriteableRuntimeExceptionTest3() throws java.lang.Exception { + super.messageNotWriteableRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageFormatRuntimeExceptionTest1() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageFormatRuntimeExceptionTest2() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void messageFormatRuntimeExceptionTest3() throws java.lang.Exception { + super.messageFormatRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jmsSecurityRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jmsSecurityRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jmsSecurityRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsSecurityRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jmsRuntimeExceptionTest1() throws java.lang.Exception { + super.jmsRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jmsRuntimeExceptionTest2() throws java.lang.Exception { + super.jmsRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jmsRuntimeExceptionTest3() throws java.lang.Exception { + super.jmsRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidSelectorRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidSelectorRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidSelectorRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidSelectorRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidDestinationRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidDestinationRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidDestinationRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidDestinationRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidClientIDRuntimeExceptionTest1() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidClientIDRuntimeExceptionTest2() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidClientIDRuntimeExceptionTest3() throws java.lang.Exception { + super.invalidClientIDRuntimeExceptionTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void illegalStateRuntimeExceptionTest1() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void illegalStateRuntimeExceptionTest2() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void illegalStateRuntimeExceptionTest3() throws java.lang.Exception { + super.illegalStateRuntimeExceptionTest3(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java new file mode 100644 index 0000000000..778efa01c1 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java @@ -0,0 +1,286 @@ +package com.sun.ts.tests.jms.core20.sessiontests; + +import com.sun.ts.tests.jms.core20.sessiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.core20.sessiontests.Client { + static final String VEHICLE_ARCHIVE = "sessiontests_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/core20/sessiontests/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive sessiontests_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "sessiontests_appclient_vehicle_client.jar"); + // The class files + sessiontests_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.jms.core20.sessiontests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + sessiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + sessiontests_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + sessiontests_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(sessiontests_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive sessiontests_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_appclient_vehicle_ear.addAsModule(sessiontests_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); + if(earResURL != null) { + sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_appclient_vehicle_ear, Client.class, earResURL); + return sessiontests_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendRecvMsgsOfEachMsgTypeTopicTest() throws java.lang.Exception { + super.sendRecvMsgsOfEachMsgTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getTransactedTopicTest() throws java.lang.Exception { + super.getTransactedTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getAcknowledgeModeTopicTest() throws java.lang.Exception { + super.getAcknowledgeModeTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createConsumerProducerTopicTest() throws java.lang.Exception { + super.createConsumerProducerTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createDurableSubscriberTopicTest1() throws java.lang.Exception { + super.createDurableSubscriberTopicTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createDurableSubscriberTopicTest2() throws java.lang.Exception { + super.createDurableSubscriberTopicTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createDurableConsumerTopicTest1() throws java.lang.Exception { + super.createDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createDurableConsumerTopicTest2() throws java.lang.Exception { + super.createDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedConsumerTopicTest1() throws java.lang.Exception { + super.createSharedConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedConsumerTopicTest2() throws java.lang.Exception { + super.createSharedConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedDurableConsumerTopicTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedDurableConsumerTopicTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createSharedDurableConsumerTopicTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest3(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidDestinationExceptionTests() throws java.lang.Exception { + super.invalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void invalidSelectorExceptionTopicTests() throws java.lang.Exception { + super.invalidSelectorExceptionTopicTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void illegalStateExceptionTests() throws java.lang.Exception { + super.illegalStateExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void jMSExceptionTests() throws java.lang.Exception { + super.jMSExceptionTests(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvMsgsOfEachMsgTypeQueueTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getTransactedQueueTest() throws java.lang.Exception { + super.getTransactedQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void getAcknowledgeModeQueueTest() throws java.lang.Exception { + super.getAcknowledgeModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void createConsumerProducerQueueTest() throws java.lang.Exception { + super.createConsumerProducerQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java new file mode 100644 index 0000000000..d85eb86a55 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java @@ -0,0 +1,322 @@ +package com.sun.ts.tests.jms.core20.sessiontests; + +import com.sun.ts.tests.jms.core20.sessiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.core20.sessiontests.Client { + static final String VEHICLE_ARCHIVE = "sessiontests_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/core20/sessiontests/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive sessiontests_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "sessiontests_ejb_vehicle_client.jar"); + // The class files + sessiontests_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + sessiontests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + sessiontests_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + sessiontests_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(sessiontests_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive sessiontests_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "sessiontests_ejb_vehicle_ejb.jar"); + // The class files + sessiontests_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.sessiontests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + sessiontests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + sessiontests_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(sessiontests_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive sessiontests_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_ejb_vehicle_ear.addAsModule(sessiontests_ejb_vehicle_ejb); + sessiontests_ejb_vehicle_ear.addAsModule(sessiontests_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); + if(earResURL != null) { + sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_ejb_vehicle_ear, Client.class, earResURL); + return sessiontests_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendRecvMsgsOfEachMsgTypeTopicTest() throws java.lang.Exception { + super.sendRecvMsgsOfEachMsgTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getTransactedTopicTest() throws java.lang.Exception { + super.getTransactedTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getAcknowledgeModeTopicTest() throws java.lang.Exception { + super.getAcknowledgeModeTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createConsumerProducerTopicTest() throws java.lang.Exception { + super.createConsumerProducerTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createDurableSubscriberTopicTest1() throws java.lang.Exception { + super.createDurableSubscriberTopicTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createDurableSubscriberTopicTest2() throws java.lang.Exception { + super.createDurableSubscriberTopicTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createDurableConsumerTopicTest1() throws java.lang.Exception { + super.createDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createDurableConsumerTopicTest2() throws java.lang.Exception { + super.createDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedConsumerTopicTest1() throws java.lang.Exception { + super.createSharedConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedConsumerTopicTest2() throws java.lang.Exception { + super.createSharedConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedDurableConsumerTopicTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedDurableConsumerTopicTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createSharedDurableConsumerTopicTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest3(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidDestinationExceptionTests() throws java.lang.Exception { + super.invalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void invalidSelectorExceptionTopicTests() throws java.lang.Exception { + super.invalidSelectorExceptionTopicTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void illegalStateExceptionTests() throws java.lang.Exception { + super.illegalStateExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void jMSExceptionTests() throws java.lang.Exception { + super.jMSExceptionTests(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvMsgsOfEachMsgTypeQueueTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getTransactedQueueTest() throws java.lang.Exception { + super.getTransactedQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void getAcknowledgeModeQueueTest() throws java.lang.Exception { + super.getAcknowledgeModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void createConsumerProducerQueueTest() throws java.lang.Exception { + super.createConsumerProducerQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java new file mode 100644 index 0000000000..e3a975012d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java @@ -0,0 +1,305 @@ +package com.sun.ts.tests.jms.core20.sessiontests; + +import com.sun.ts.tests.jms.core20.sessiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.core20.sessiontests.Client { + static final String VEHICLE_ARCHIVE = "sessiontests_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/sessiontests/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive sessiontests_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "sessiontests_jsp_vehicle_web.war"); + // The class files + sessiontests_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.sessiontests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/jsp_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + sessiontests_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(sessiontests_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive sessiontests_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_jsp_vehicle_ear.addAsModule(sessiontests_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); + if(earResURL != null) { + sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_jsp_vehicle_ear, Client.class, earResURL); + return sessiontests_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendRecvMsgsOfEachMsgTypeTopicTest() throws java.lang.Exception { + super.sendRecvMsgsOfEachMsgTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getTransactedTopicTest() throws java.lang.Exception { + super.getTransactedTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getAcknowledgeModeTopicTest() throws java.lang.Exception { + super.getAcknowledgeModeTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createConsumerProducerTopicTest() throws java.lang.Exception { + super.createConsumerProducerTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createDurableSubscriberTopicTest1() throws java.lang.Exception { + super.createDurableSubscriberTopicTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createDurableSubscriberTopicTest2() throws java.lang.Exception { + super.createDurableSubscriberTopicTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createDurableConsumerTopicTest1() throws java.lang.Exception { + super.createDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createDurableConsumerTopicTest2() throws java.lang.Exception { + super.createDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedConsumerTopicTest1() throws java.lang.Exception { + super.createSharedConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedConsumerTopicTest2() throws java.lang.Exception { + super.createSharedConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedDurableConsumerTopicTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedDurableConsumerTopicTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createSharedDurableConsumerTopicTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest3(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidDestinationExceptionTests() throws java.lang.Exception { + super.invalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void invalidSelectorExceptionTopicTests() throws java.lang.Exception { + super.invalidSelectorExceptionTopicTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void illegalStateExceptionTests() throws java.lang.Exception { + super.illegalStateExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void jMSExceptionTests() throws java.lang.Exception { + super.jMSExceptionTests(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvMsgsOfEachMsgTypeQueueTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getTransactedQueueTest() throws java.lang.Exception { + super.getTransactedQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void getAcknowledgeModeQueueTest() throws java.lang.Exception { + super.getAcknowledgeModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void createConsumerProducerQueueTest() throws java.lang.Exception { + super.createConsumerProducerQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java new file mode 100644 index 0000000000..6964776c29 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java @@ -0,0 +1,298 @@ +package com.sun.ts.tests.jms.core20.sessiontests; + +import com.sun.ts.tests.jms.core20.sessiontests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.core20.sessiontests.Client { + static final String VEHICLE_ARCHIVE = "sessiontests_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + sessiontests_appclient_vehicle: + sessiontests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle: + sessiontests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml,META-INF/application-client.xml,jar.sun-application-client.xml + sessiontests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + sessiontests_jsp_vehicle: + sessiontests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + sessiontests_servlet_vehicle: + sessiontests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/core20/sessiontests/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive sessiontests_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "sessiontests_servlet_vehicle_web.war"); + // The class files + sessiontests_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.core20.sessiontests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/servlet_vehicle_web.xml"); + if(warResURL != null) { + sessiontests_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(sessiontests_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive sessiontests_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "sessiontests_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + sessiontests_servlet_vehicle_ear.addAsModule(sessiontests_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); + if(earResURL != null) { + sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + if(earResURL != null) { + sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(sessiontests_servlet_vehicle_ear, Client.class, earResURL); + return sessiontests_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendRecvMsgsOfEachMsgTypeTopicTest() throws java.lang.Exception { + super.sendRecvMsgsOfEachMsgTypeTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createTemporayTopicTest() throws java.lang.Exception { + super.createTemporayTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getTransactedTopicTest() throws java.lang.Exception { + super.getTransactedTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getAcknowledgeModeTopicTest() throws java.lang.Exception { + super.getAcknowledgeModeTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createConsumerProducerTopicTest() throws java.lang.Exception { + super.createConsumerProducerTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createDurableSubscriberTopicTest1() throws java.lang.Exception { + super.createDurableSubscriberTopicTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createDurableSubscriberTopicTest2() throws java.lang.Exception { + super.createDurableSubscriberTopicTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createDurableConsumerTopicTest1() throws java.lang.Exception { + super.createDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createDurableConsumerTopicTest2() throws java.lang.Exception { + super.createDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedConsumerTopicTest1() throws java.lang.Exception { + super.createSharedConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedConsumerTopicTest2() throws java.lang.Exception { + super.createSharedConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedDurableConsumerTopicTest1() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest1(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedDurableConsumerTopicTest2() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest2(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createSharedDurableConsumerTopicTest3() throws java.lang.Exception { + super.createSharedDurableConsumerTopicTest3(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidDestinationExceptionTests() throws java.lang.Exception { + super.invalidDestinationExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void invalidSelectorExceptionTopicTests() throws java.lang.Exception { + super.invalidSelectorExceptionTopicTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void illegalStateExceptionTests() throws java.lang.Exception { + super.illegalStateExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void jMSExceptionTests() throws java.lang.Exception { + super.jMSExceptionTests(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvMsgsOfEachMsgTypeQueueTest() throws java.lang.Exception { + super.sendAndRecvMsgsOfEachMsgTypeQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createTemporayQueueTest() throws java.lang.Exception { + super.createTemporayQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createQueueBrowserTest() throws java.lang.Exception { + super.createQueueBrowserTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getTransactedQueueTest() throws java.lang.Exception { + super.getTransactedQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void getAcknowledgeModeQueueTest() throws java.lang.Exception { + super.getAcknowledgeModeQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void createConsumerProducerQueueTest() throws java.lang.Exception { + super.createConsumerProducerQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java new file mode 100644 index 0000000000..4408c5b4f2 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java @@ -0,0 +1,216 @@ +package com.sun.ts.tests.jms.ee.ejb.queueCMTTests; + +import com.sun.ts.tests.jms.ee.ejb.queueCMTTests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.ejb.queueCMTTests.Client { + /** + EE10 Deployment Descriptors: + jms_ejb_queueCMTTests: + jms_ejb_queueCMTTests_client: META-INF/application-client.xml,jar.sun-application-client.xml + jms_ejb_queueCMTTests_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_client.xml + /com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_ejb.xml + /com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "jms_ejb_queueCMTTests", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jms_ejb_queueCMTTests_client = ShrinkWrap.create(JavaArchive.class, "jms_ejb_queueCMTTests_client.jar"); + // The class files + jms_ejb_queueCMTTests_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.ejb.queueCMTTests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.commonee.Tests.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_client.xml"); + if(resURL != null) { + jms_ejb_queueCMTTests_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_client.jar.sun-application-client.xml"); + if(resURL != null) { + jms_ejb_queueCMTTests_client.addAsManifestResource(resURL, "application-client.xml"); + } + jms_ejb_queueCMTTests_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jms_ejb_queueCMTTests_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jms_ejb_queueCMTTests_ejb = ShrinkWrap.create(JavaArchive.class, "jms_ejb_queueCMTTests_ejb.jar"); + // The class files + jms_ejb_queueCMTTests_ejb.addClasses( + com.sun.ts.tests.jms.commonee.TestsEJB.class, + com.sun.ts.tests.jms.commonee.Tests.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_ejb.xml"); + if(ejbResURL != null) { + jms_ejb_queueCMTTests_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/jms_ejb_queueCMTTests_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jms_ejb_queueCMTTests_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jms_ejb_queueCMTTests_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jms_ejb_queueCMTTests_ear = ShrinkWrap.create(EnterpriseArchive.class, "jms_ejb_queueCMTTests.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jms_ejb_queueCMTTests_ear.addAsModule(jms_ejb_queueCMTTests_ejb); + jms_ejb_queueCMTTests_ear.addAsModule(jms_ejb_queueCMTTests_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/"); + if(earResURL != null) { + jms_ejb_queueCMTTests_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/.ear.sun-application.xml"); + if(earResURL != null) { + jms_ejb_queueCMTTests_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jms_ejb_queueCMTTests_ear, Client.class, earResURL); + return jms_ejb_queueCMTTests_ear; + } + + @Test + @Override + public void bytesMessageFullMsgTests() throws java.lang.Exception { + super.bytesMessageFullMsgTests(); + } + + @Test + @Override + public void mapMessageFullMsgTest() throws java.lang.Exception { + super.mapMessageFullMsgTest(); + } + + @Test + @Override + public void streamMessageFullMsgTest() throws java.lang.Exception { + super.streamMessageFullMsgTest(); + } + + @Test + @Override + public void msgHdrIDTest() throws java.lang.Exception { + super.msgHdrIDTest(); + } + + @Test + @Override + public void msgHdrTimeStampTest() throws java.lang.Exception { + super.msgHdrTimeStampTest(); + } + + @Test + @Override + public void msgHdrCorlIdTest() throws java.lang.Exception { + super.msgHdrCorlIdTest(); + } + + @Test + @Override + public void msgHdrReplyToTest() throws java.lang.Exception { + super.msgHdrReplyToTest(); + } + + @Test + @Override + public void msgHdrJMSTypeTest() throws java.lang.Exception { + super.msgHdrJMSTypeTest(); + } + + @Test + @Override + public void msgHdrJMSPriorityTest() throws java.lang.Exception { + super.msgHdrJMSPriorityTest(); + } + + @Test + @Override + public void msgHdrJMSExpirationTest() throws java.lang.Exception { + super.msgHdrJMSExpirationTest(); + } + + @Test + @Override + public void msgHdrJMSDestinationTest() throws java.lang.Exception { + super.msgHdrJMSDestinationTest(); + } + + @Test + @Override + public void msgHdrJMSDeliveryModeTest() throws java.lang.Exception { + super.msgHdrJMSDeliveryModeTest(); + } + + @Test + @Override + public void messageOrderTest() throws java.lang.Exception { + super.messageOrderTest(); + } + + @Test + @Override + public void nullDestinationTest() throws java.lang.Exception { + super.nullDestinationTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java new file mode 100644 index 0000000000..492356c014 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java @@ -0,0 +1,144 @@ +package com.sun.ts.tests.jms.ee.ejb.sessionQtests; + +import com.sun.ts.tests.jms.ee.ejb.sessionQtests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.ejb.sessionQtests.Client { + /** + EE10 Deployment Descriptors: + jms_ejb_sessionQtests: + jms_ejb_sessionQtests_client: META-INF/application-client.xml,jar.sun-application-client.xml + jms_ejb_sessionQtests_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_client.xml + /com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_ejb.xml + /com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "jms_ejb_sessionQtests", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jms_ejb_sessionQtests_client = ShrinkWrap.create(JavaArchive.class, "jms_ejb_sessionQtests_client.jar"); + // The class files + jms_ejb_sessionQtests_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.ee.ejb.sessionQtests.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.commonee.Tests.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_client.xml"); + if(resURL != null) { + jms_ejb_sessionQtests_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_client.jar.sun-application-client.xml"); + if(resURL != null) { + jms_ejb_sessionQtests_client.addAsManifestResource(resURL, "application-client.xml"); + } + jms_ejb_sessionQtests_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jms_ejb_sessionQtests_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jms_ejb_sessionQtests_ejb = ShrinkWrap.create(JavaArchive.class, "jms_ejb_sessionQtests_ejb.jar"); + // The class files + jms_ejb_sessionQtests_ejb.addClasses( + com.sun.ts.tests.jms.commonee.TestsEJB.class, + com.sun.ts.tests.jms.commonee.Tests.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_ejb.xml"); + if(ejbResURL != null) { + jms_ejb_sessionQtests_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/jms_ejb_sessionQtests_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jms_ejb_sessionQtests_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jms_ejb_sessionQtests_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jms_ejb_sessionQtests_ear = ShrinkWrap.create(EnterpriseArchive.class, "jms_ejb_sessionQtests.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jms_ejb_sessionQtests_ear.addAsModule(jms_ejb_sessionQtests_ejb); + jms_ejb_sessionQtests_ear.addAsModule(jms_ejb_sessionQtests_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/"); + if(earResURL != null) { + jms_ejb_sessionQtests_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/.ear.sun-application.xml"); + if(earResURL != null) { + jms_ejb_sessionQtests_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jms_ejb_sessionQtests_ear, Client.class, earResURL); + return jms_ejb_sessionQtests_ear; + } + + @Test + @Override + public void simpleSendReceiveQueueTest() throws java.lang.Exception { + super.simpleSendReceiveQueueTest(); + } + + @Test + @Override + public void selectorAndBrowserTests() throws java.lang.Exception { + super.selectorAndBrowserTests(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java new file mode 100644 index 0000000000..6e8b5f3626 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java @@ -0,0 +1,137 @@ +package com.sun.ts.tests.jms.ee.ejb.sessionTtests; + +import com.sun.ts.tests.jms.ee.ejb.sessionTtests.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.ejb.sessionTtests.Client { + /** + EE10 Deployment Descriptors: + jms_ejb_sessionTtests: + jms_ejb_sessionTtests_client: jar.sun-application-client.xml + jms_ejb_sessionTtests_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_ejb.xml + /com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "jms_ejb_sessionTtests", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive jms_ejb_sessionTtests_client = ShrinkWrap.create(JavaArchive.class, "jms_ejb_sessionTtests_client.jar"); + // The class files + jms_ejb_sessionTtests_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.jms.commonee.TestsT.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.ejb.sessionTtests.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_client.xml"); + if(resURL != null) { + jms_ejb_sessionTtests_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_client.jar.sun-application-client.xml"); + if(resURL != null) { + jms_ejb_sessionTtests_client.addAsManifestResource(resURL, "application-client.xml"); + } + jms_ejb_sessionTtests_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(jms_ejb_sessionTtests_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive jms_ejb_sessionTtests_ejb = ShrinkWrap.create(JavaArchive.class, "jms_ejb_sessionTtests_ejb.jar"); + // The class files + jms_ejb_sessionTtests_ejb.addClasses( + com.sun.ts.tests.jms.commonee.TestsT.class, + com.sun.ts.tests.jms.commonee.TestsTEJB.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_ejb.xml"); + if(ejbResURL != null) { + jms_ejb_sessionTtests_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/jms_ejb_sessionTtests_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + jms_ejb_sessionTtests_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(jms_ejb_sessionTtests_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive jms_ejb_sessionTtests_ear = ShrinkWrap.create(EnterpriseArchive.class, "jms_ejb_sessionTtests.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + jms_ejb_sessionTtests_ear.addAsModule(jms_ejb_sessionTtests_ejb); + jms_ejb_sessionTtests_ear.addAsModule(jms_ejb_sessionTtests_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/"); + if(earResURL != null) { + jms_ejb_sessionTtests_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/.ear.sun-application.xml"); + if(earResURL != null) { + jms_ejb_sessionTtests_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(jms_ejb_sessionTtests_ear, Client.class, earResURL); + return jms_ejb_sessionTtests_ear; + } + + @Test + @Override + public void simpleSendReceiveT() throws java.lang.Exception { + super.simpleSendReceiveT(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java new file mode 100644 index 0000000000..62dafd3c96 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java @@ -0,0 +1,221 @@ +package com.sun.ts.tests.jms.ee.ejbweb.xa; + +import com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TransactionTestsEjbTest extends com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests { + static final String VEHICLE_ARCHIVE = "transaction_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + transaction_ejb_vehicle: + transaction_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + transaction_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + transaction_jsp_vehicle: + transaction_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + transaction_servlet_vehicle: + transaction_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + transactional_ejblitejsf_vehicle_web: WEB-INF/beans.xml,WEB-INF/faces-config.xml,WEB-INF/web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/ejbweb/xa/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive transaction_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "transaction_ejb_vehicle_client.jar"); + // The class files + transaction_ejb_vehicle_client.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + transaction_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = TransactionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + transaction_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + transaction_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + TransactionTests.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(transaction_ejb_vehicle_client, TransactionTests.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive transaction_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "transaction_ejb_vehicle_ejb.jar"); + // The class files + transaction_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = TransactionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + transaction_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = TransactionTests.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + transaction_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(transaction_ejb_vehicle_ejb, TransactionTests.class, ejbResURL); + + // Ear + EnterpriseArchive transaction_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "transaction_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + transaction_ejb_vehicle_ear.addAsModule(transaction_ejb_vehicle_ejb); + transaction_ejb_vehicle_ear.addAsModule(transaction_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/"); + if(earResURL != null) { + transaction_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/.ear.sun-application.xml"); + if(earResURL != null) { + transaction_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(transaction_ejb_vehicle_ear, TransactionTests.class, earResURL); + return transaction_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test01() throws java.lang.Exception { + super.Test01(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test02() throws java.lang.Exception { + super.Test02(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test03() throws java.lang.Exception { + super.Test03(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test04() throws java.lang.Exception { + super.Test04(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test05() throws java.lang.Exception { + super.Test05(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test06() throws java.lang.Exception { + super.Test06(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test07() throws java.lang.Exception { + super.Test07(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test08() throws java.lang.Exception { + super.Test08(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test09() throws java.lang.Exception { + super.Test09(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void Test10() throws java.lang.Exception { + super.Test10(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java new file mode 100644 index 0000000000..e4c3ecbd73 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java @@ -0,0 +1,205 @@ +package com.sun.ts.tests.jms.ee.ejbweb.xa; + +import com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TransactionTestsJspTest extends com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests { + static final String VEHICLE_ARCHIVE = "transaction_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + transaction_ejb_vehicle: + transaction_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + transaction_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + transaction_jsp_vehicle: + transaction_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + transaction_servlet_vehicle: + transaction_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + transactional_ejblitejsf_vehicle_web: WEB-INF/beans.xml,WEB-INF/faces-config.xml,WEB-INF/web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/ee/ejbweb/xa/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive transaction_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "transaction_jsp_vehicle_web.war"); + // The class files + transaction_jsp_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + transaction_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TransactionTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + transaction_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + transaction_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/jsp_vehicle_web.xml"); + if(warResURL != null) { + transaction_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + transaction_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + transaction_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(transaction_jsp_vehicle_web, TransactionTests.class, warResURL); + + // Ear + EnterpriseArchive transaction_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "transaction_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + transaction_jsp_vehicle_ear.addAsModule(transaction_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/"); + if(earResURL != null) { + transaction_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/.ear.sun-application.xml"); + if(earResURL != null) { + transaction_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(transaction_jsp_vehicle_ear, TransactionTests.class, earResURL); + return transaction_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test01() throws java.lang.Exception { + super.Test01(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test02() throws java.lang.Exception { + super.Test02(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test03() throws java.lang.Exception { + super.Test03(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test04() throws java.lang.Exception { + super.Test04(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test05() throws java.lang.Exception { + super.Test05(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test06() throws java.lang.Exception { + super.Test06(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test07() throws java.lang.Exception { + super.Test07(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test08() throws java.lang.Exception { + super.Test08(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test09() throws java.lang.Exception { + super.Test09(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void Test10() throws java.lang.Exception { + super.Test10(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java new file mode 100644 index 0000000000..e3d2acabaf --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java @@ -0,0 +1,198 @@ +package com.sun.ts.tests.jms.ee.ejbweb.xa; + +import com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class TransactionTestsServletTest extends com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests { + static final String VEHICLE_ARCHIVE = "transaction_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + transaction_ejb_vehicle: + transaction_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + transaction_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + transaction_jsp_vehicle: + transaction_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + transaction_servlet_vehicle: + transaction_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml + transactional_ejblitejsf_vehicle_web: WEB-INF/beans.xml,WEB-INF/faces-config.xml,WEB-INF/web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/ee/ejbweb/xa/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive transaction_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "transaction_servlet_vehicle_web.war"); + // The class files + transaction_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + transaction_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = TransactionTests.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + transaction_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + transaction_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/servlet_vehicle_web.xml"); + if(warResURL != null) { + transaction_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(transaction_servlet_vehicle_web, TransactionTests.class, warResURL); + + // Ear + EnterpriseArchive transaction_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "transaction_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + transaction_servlet_vehicle_ear.addAsModule(transaction_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/"); + if(earResURL != null) { + transaction_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/.ear.sun-application.xml"); + if(earResURL != null) { + transaction_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(transaction_servlet_vehicle_ear, TransactionTests.class, earResURL); + return transaction_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test01() throws java.lang.Exception { + super.Test01(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test02() throws java.lang.Exception { + super.Test02(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test03() throws java.lang.Exception { + super.Test03(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test04() throws java.lang.Exception { + super.Test04(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test05() throws java.lang.Exception { + super.Test05(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test06() throws java.lang.Exception { + super.Test06(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test07() throws java.lang.Exception { + super.Test07(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test08() throws java.lang.Exception { + super.Test08(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test09() throws java.lang.Exception { + super.Test09(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void Test10() throws java.lang.Exception { + super.Test10(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java new file mode 100644 index 0000000000..bda2d16596 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java @@ -0,0 +1,198 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_exceptQ; + +import com.sun.ts.tests.jms.ee.mdb.mdb_exceptQ.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_exceptQ.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_exceptQ: + mdb_exceptQ_client: META-INF/application-client.xml,jar.sun-application-client.xml + mdb_exceptQ_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_client.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_exceptQ", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_exceptQ_client = ShrinkWrap.create(JavaArchive.class, "mdb_exceptQ_client.jar"); + // The class files + mdb_exceptQ_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.ee.mdb.mdb_exceptQ.MDBClient.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_client.xml"); + if(resURL != null) { + mdb_exceptQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_exceptQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_exceptQ_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_exceptQ_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_exceptQ_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_exceptQ_ejb.jar"); + // The class files + mdb_exceptQ_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_exceptQ.MsgBean.class, + com.sun.ts.tests.jms.commonee.ParentMsgBeanNoTx.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_ejb.xml"); + if(ejbResURL != null) { + mdb_exceptQ_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/mdb_exceptQ_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_exceptQ_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_exceptQ_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_exceptQ_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_exceptQ.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_exceptQ_ear.addAsModule(mdb_exceptQ_ejb); + mdb_exceptQ_ear.addAsModule(mdb_exceptQ_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/"); + if(earResURL != null) { + mdb_exceptQ_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_exceptQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_exceptQ_ear, MDBClient.class, earResURL); + return mdb_exceptQ_ear; + } + + @Test + @Override + public void Test1() throws java.lang.Exception { + super.Test1(); + } + + @Test + @Override + public void Test2() throws java.lang.Exception { + super.Test2(); + } + + @Test + @Override + public void Test3() throws java.lang.Exception { + super.Test3(); + } + + @Test + @Override + public void Test4() throws java.lang.Exception { + super.Test4(); + } + + @Test + @Override + public void Test5() throws java.lang.Exception { + super.Test5(); + } + + @Test + @Override + public void Test6() throws java.lang.Exception { + super.Test6(); + } + + @Test + @Override + public void Test7() throws java.lang.Exception { + super.Test7(); + } + + @Test + @Override + public void Test8() throws java.lang.Exception { + super.Test8(); + } + + @Test + @Override + public void Test11() throws java.lang.Exception { + super.Test11(); + } + + @Test + @Override + public void Test12() throws java.lang.Exception { + super.Test12(); + } + + @Test + @Override + public void Test15() throws java.lang.Exception { + super.Test15(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java new file mode 100644 index 0000000000..381654676d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java @@ -0,0 +1,198 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_exceptT; + +import com.sun.ts.tests.jms.ee.mdb.mdb_exceptT.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_exceptT.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_exceptT: + mdb_exceptT_client: META-INF/application-client.xml,jar.sun-application-client.xml + mdb_exceptT_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_client.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_exceptT", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_exceptT_client = ShrinkWrap.create(JavaArchive.class, "mdb_exceptT_client.jar"); + // The class files + mdb_exceptT_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.ee.mdb.mdb_exceptT.MDBClient.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_client.xml"); + if(resURL != null) { + mdb_exceptT_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_exceptT_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_exceptT_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_exceptT_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_exceptT_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_exceptT_ejb.jar"); + // The class files + mdb_exceptT_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.ParentMsgBeanNoTx.class, + com.sun.ts.tests.jms.ee.mdb.mdb_exceptT.MsgBean.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_ejb.xml"); + if(ejbResURL != null) { + mdb_exceptT_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/mdb_exceptT_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_exceptT_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_exceptT_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_exceptT_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_exceptT.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_exceptT_ear.addAsModule(mdb_exceptT_ejb); + mdb_exceptT_ear.addAsModule(mdb_exceptT_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/"); + if(earResURL != null) { + mdb_exceptT_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_exceptT_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_exceptT_ear, MDBClient.class, earResURL); + return mdb_exceptT_ear; + } + + @Test + @Override + public void Test1() throws java.lang.Exception { + super.Test1(); + } + + @Test + @Override + public void Test2() throws java.lang.Exception { + super.Test2(); + } + + @Test + @Override + public void Test3() throws java.lang.Exception { + super.Test3(); + } + + @Test + @Override + public void Test4() throws java.lang.Exception { + super.Test4(); + } + + @Test + @Override + public void Test5() throws java.lang.Exception { + super.Test5(); + } + + @Test + @Override + public void Test6() throws java.lang.Exception { + super.Test6(); + } + + @Test + @Override + public void Test7() throws java.lang.Exception { + super.Test7(); + } + + @Test + @Override + public void Test8() throws java.lang.Exception { + super.Test8(); + } + + @Test + @Override + public void Test11() throws java.lang.Exception { + super.Test11(); + } + + @Test + @Override + public void Test12() throws java.lang.Exception { + super.Test12(); + } + + @Test + @Override + public void Test13() throws java.lang.Exception { + super.Test13(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java new file mode 100644 index 0000000000..c3e6b19613 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java @@ -0,0 +1,211 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrQ; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrQ.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrQ.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgHdrQ: + mdb_msgHdrQ_client: jar.sun-application-client.xml + mdb_msgHdrQ_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgHdrQ", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgHdrQ_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgHdrQ_client.jar"); + // The class files + mdb_msgHdrQ_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrQ.MDBClient.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_client.xml"); + if(resURL != null) { + mdb_msgHdrQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgHdrQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgHdrQ_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgHdrQ_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgHdrQ_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgHdrQ_ejb.jar"); + // The class files + mdb_msgHdrQ_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrQ.MsgBeanMsgTestHdrQ.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_ejb.xml"); + if(ejbResURL != null) { + mdb_msgHdrQ_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/mdb_msgHdrQ_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgHdrQ_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgHdrQ_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgHdrQ_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgHdrQ.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgHdrQ_ear.addAsModule(mdb_msgHdrQ_ejb); + mdb_msgHdrQ_ear.addAsModule(mdb_msgHdrQ_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/"); + if(earResURL != null) { + mdb_msgHdrQ_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgHdrQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgHdrQ_ear, MDBClient.class, earResURL); + return mdb_msgHdrQ_ear; + } + + @Test + @Override + public void mdbMsgHdrTimeStampQTest() throws java.lang.Exception { + super.mdbMsgHdrTimeStampQTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdQTextTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdQTextTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdQBytesTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdQBytesTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdQMapTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdQMapTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdQStreamTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdQStreamTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdQObjectTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdQObjectTest(); + } + + @Test + @Override + public void mdbMsgHdrReplyToQTest() throws java.lang.Exception { + super.mdbMsgHdrReplyToQTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSTypeQTest() throws java.lang.Exception { + super.mdbMsgHdrJMSTypeQTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSPriorityQTest() throws java.lang.Exception { + super.mdbMsgHdrJMSPriorityQTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSExpirationQueueTest() throws java.lang.Exception { + super.mdbMsgHdrJMSExpirationQueueTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSDestinationQTest() throws java.lang.Exception { + super.mdbMsgHdrJMSDestinationQTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSDeliveryModeQTest() throws java.lang.Exception { + super.mdbMsgHdrJMSDeliveryModeQTest(); + } + + @Test + @Override + public void mdbMsgHdrIDQTest() throws java.lang.Exception { + super.mdbMsgHdrIDQTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java new file mode 100644 index 0000000000..1fe002853b --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java @@ -0,0 +1,211 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrT; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrT.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrT.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgHdrT: + mdb_msgHdrT_client: jar.sun-application-client.xml + mdb_msgHdrT_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgHdrT", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgHdrT_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgHdrT_client.jar"); + // The class files + mdb_msgHdrT_client.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrT.MDBClient.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_client.xml"); + if(resURL != null) { + mdb_msgHdrT_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgHdrT_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgHdrT_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgHdrT_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgHdrT_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgHdrT_ejb.jar"); + // The class files + mdb_msgHdrT_ejb.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrT.MsgBeanMsgTestHdrT.class, + com.sun.ts.tests.jms.common.JmsUtil.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.xml"); + if(ejbResURL != null) { + mdb_msgHdrT_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgHdrT_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgHdrT_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgHdrT_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgHdrT.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgHdrT_ear.addAsModule(mdb_msgHdrT_ejb); + mdb_msgHdrT_ear.addAsModule(mdb_msgHdrT_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/"); + if(earResURL != null) { + mdb_msgHdrT_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgHdrT_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgHdrT_ear, MDBClient.class, earResURL); + return mdb_msgHdrT_ear; + } + + @Test + @Override + public void mdbMsgHdrTimeStampTTest() throws java.lang.Exception { + super.mdbMsgHdrTimeStampTTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdTTextTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdTTextTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdTBytesTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdTBytesTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdTMapTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdTMapTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdTStreamTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdTStreamTest(); + } + + @Test + @Override + public void mdbMsgHdrCorlIdTObjectTest() throws java.lang.Exception { + super.mdbMsgHdrCorlIdTObjectTest(); + } + + @Test + @Override + public void mdbMsgHdrReplyToTTest() throws java.lang.Exception { + super.mdbMsgHdrReplyToTTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSTypeTTest() throws java.lang.Exception { + super.mdbMsgHdrJMSTypeTTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSPriorityTTest() throws java.lang.Exception { + super.mdbMsgHdrJMSPriorityTTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSExpirationTopicTest() throws java.lang.Exception { + super.mdbMsgHdrJMSExpirationTopicTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSDestinationTTest() throws java.lang.Exception { + super.mdbMsgHdrJMSDestinationTTest(); + } + + @Test + @Override + public void mdbMsgHdrJMSDeliveryModeTTest() throws java.lang.Exception { + super.mdbMsgHdrJMSDeliveryModeTTest(); + } + + @Test + @Override + public void mdbMsgHdrIDTTest() throws java.lang.Exception { + super.mdbMsgHdrIDTTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java new file mode 100644 index 0000000000..a0589eaade --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java @@ -0,0 +1,145 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsQ; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsQ.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsQ.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgPropsQ: + mdb_msgPropsQ_client: jar.sun-application-client.xml + mdb_msgPropsQ_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgPropsQ", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgPropsQ_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgPropsQ_client.jar"); + // The class files + mdb_msgPropsQ_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsQ.MDBClient.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_client.xml"); + if(resURL != null) { + mdb_msgPropsQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgPropsQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgPropsQ_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgPropsQ_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgPropsQ_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgPropsQ_ejb.jar"); + // The class files + mdb_msgPropsQ_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsQ.MsgBeanMsgTestPropsQ.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.xml"); + if(ejbResURL != null) { + mdb_msgPropsQ_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgPropsQ_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgPropsQ_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgPropsQ_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgPropsQ.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgPropsQ_ear.addAsModule(mdb_msgPropsQ_ejb); + mdb_msgPropsQ_ear.addAsModule(mdb_msgPropsQ_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/"); + if(earResURL != null) { + mdb_msgPropsQ_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgPropsQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgPropsQ_ear, MDBClient.class, earResURL); + return mdb_msgPropsQ_ear; + } + + @Test + @Override + public void mdbMsgPropertiesQTest() throws java.lang.Exception { + super.mdbMsgPropertiesQTest(); + } + + @Test + @Override + public void mdbMsgPropertiesConversionQTest() throws java.lang.Exception { + super.mdbMsgPropertiesConversionQTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java new file mode 100644 index 0000000000..3a55364592 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java @@ -0,0 +1,145 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsT; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsT.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsT.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgPropsT: + mdb_msgPropsT_client: jar.sun-application-client.xml + mdb_msgPropsT_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgPropsT", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgPropsT_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgPropsT_client.jar"); + // The class files + mdb_msgPropsT_client.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsT.MDBClient.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_client.xml"); + if(resURL != null) { + mdb_msgPropsT_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgPropsT_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgPropsT_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgPropsT_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgPropsT_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgPropsT_ejb.jar"); + // The class files + mdb_msgPropsT_ejb.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsT.MsgBeanMsgTestPropsT.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.xml"); + if(ejbResURL != null) { + mdb_msgPropsT_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgPropsT_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgPropsT_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgPropsT_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgPropsT.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgPropsT_ear.addAsModule(mdb_msgPropsT_ejb); + mdb_msgPropsT_ear.addAsModule(mdb_msgPropsT_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/"); + if(earResURL != null) { + mdb_msgPropsT_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgPropsT_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgPropsT_ear, MDBClient.class, earResURL); + return mdb_msgPropsT_ear; + } + + @Test + @Override + public void mdbMsgPropertiesTTest() throws java.lang.Exception { + super.mdbMsgPropertiesTTest(); + } + + @Test + @Override + public void mdbMsgPropertiesConversionTTest() throws java.lang.Exception { + super.mdbMsgPropertiesConversionTTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java new file mode 100644 index 0000000000..37c4ee3b6f --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java @@ -0,0 +1,217 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ1; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ1.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ1.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgTypesQ1: + mdb_msgTypesQ1_client: jar.sun-application-client.xml + mdb_msgTypesQ1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgTypesQ1", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgTypesQ1_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesQ1_client.jar"); + // The class files + mdb_msgTypesQ1_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ1.MDBClient.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_client.xml"); + if(resURL != null) { + mdb_msgTypesQ1_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgTypesQ1_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgTypesQ1_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgTypesQ1_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgTypesQ1_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesQ1_ejb.jar"); + // The class files + mdb_msgTypesQ1_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ1.MsgBean.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.xml"); + if(ejbResURL != null) { + mdb_msgTypesQ1_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgTypesQ1_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgTypesQ1_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgTypesQ1_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgTypesQ1.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgTypesQ1_ear.addAsModule(mdb_msgTypesQ1_ejb); + mdb_msgTypesQ1_ear.addAsModule(mdb_msgTypesQ1_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/"); + if(earResURL != null) { + mdb_msgTypesQ1_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgTypesQ1_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgTypesQ1_ear, MDBClient.class, earResURL); + return mdb_msgTypesQ1_ear; + } + + @Test + @Override + public void mdbBytesMsgNullStreamQTest() throws java.lang.Exception { + super.mdbBytesMsgNullStreamQTest(); + } + + @Test + @Override + public void mdbBytesMessageQTestsFullMsg() throws java.lang.Exception { + super.mdbBytesMessageQTestsFullMsg(); + } + + @Test + @Override + public void mdbMapMessageFullMsgQTest() throws java.lang.Exception { + super.mdbMapMessageFullMsgQTest(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsBoolean() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsBoolean(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsByte() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsByte(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsShort() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsShort(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsChar() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsChar(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsInt() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsInt(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsLong() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsLong(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsFloat() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsFloat(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsDouble() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsDouble(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsString() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsString(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsBytes() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsBytes(); + } + + @Test + @Override + public void mdbMapMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.mdbMapMessageConversionQTestsInvFormatString(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java new file mode 100644 index 0000000000..7d45478e94 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java @@ -0,0 +1,217 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ2; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ2.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ2.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgTypesQ2: + mdb_msgTypesQ2_client: jar.sun-application-client.xml + mdb_msgTypesQ2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgTypesQ2", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgTypesQ2_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesQ2_client.jar"); + // The class files + mdb_msgTypesQ2_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ2.MDBClient.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_client.xml"); + if(resURL != null) { + mdb_msgTypesQ2_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgTypesQ2_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgTypesQ2_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgTypesQ2_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgTypesQ2_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesQ2_ejb.jar"); + // The class files + mdb_msgTypesQ2_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_TestEJB.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ2.MsgBeanMsgTestQ2.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.xml"); + if(ejbResURL != null) { + mdb_msgTypesQ2_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgTypesQ2_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgTypesQ2_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgTypesQ2_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgTypesQ2.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgTypesQ2_ear.addAsModule(mdb_msgTypesQ2_ejb); + mdb_msgTypesQ2_ear.addAsModule(mdb_msgTypesQ2_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/"); + if(earResURL != null) { + mdb_msgTypesQ2_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgTypesQ2_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgTypesQ2_ear, MDBClient.class, earResURL); + return mdb_msgTypesQ2_ear; + } + + @Test + @Override + public void mdbMessageObjectCopyQTest() throws java.lang.Exception { + super.mdbMessageObjectCopyQTest(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsBoolean() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsBoolean(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsByte() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsByte(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsShort() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsShort(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsInt() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsInt(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsLong() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsLong(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsFloat() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsFloat(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsDouble() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsDouble(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsString() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsString(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsChar() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsChar(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsBytes() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsBytes(); + } + + @Test + @Override + public void mdbStreamMessageConversionQTestsInvFormatString() throws java.lang.Exception { + super.mdbStreamMessageConversionQTestsInvFormatString(); + } + + @Test + @Override + public void mdbStreamMessageQTestsFullMsg() throws java.lang.Exception { + super.mdbStreamMessageQTestsFullMsg(); + } + + @Test + @Override + public void mdbStreamMessageQTestNull() throws java.lang.Exception { + super.mdbStreamMessageQTestNull(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java new file mode 100644 index 0000000000..08daf0105f --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java @@ -0,0 +1,181 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ3; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ3.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ3.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgTypesQ3: + mdb_msgTypesQ3_client: jar.sun-application-client.xml + mdb_msgTypesQ3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgTypesQ3", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgTypesQ3_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesQ3_client.jar"); + // The class files + mdb_msgTypesQ3_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ3.MDBClient.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_client.xml"); + if(resURL != null) { + mdb_msgTypesQ3_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgTypesQ3_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgTypesQ3_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgTypesQ3_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgTypesQ3_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesQ3_ejb.jar"); + // The class files + mdb_msgTypesQ3_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ3.MsgBeanMsgTestQ3.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.xml"); + if(ejbResURL != null) { + mdb_msgTypesQ3_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgTypesQ3_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgTypesQ3_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgTypesQ3_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgTypesQ3.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgTypesQ3_ear.addAsModule(mdb_msgTypesQ3_ejb); + mdb_msgTypesQ3_ear.addAsModule(mdb_msgTypesQ3_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/"); + if(earResURL != null) { + mdb_msgTypesQ3_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgTypesQ3_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgTypesQ3_ear, MDBClient.class, earResURL); + return mdb_msgTypesQ3_ear; + } + + @Test + @Override + public void mdbMsgClearBodyQueueTextTest() throws java.lang.Exception { + super.mdbMsgClearBodyQueueTextTest(); + } + + @Test + @Override + public void mdbMsgClearBodyQueueObjectTest() throws java.lang.Exception { + super.mdbMsgClearBodyQueueObjectTest(); + } + + @Test + @Override + public void mdbMsgClearBodyQueueMapTest() throws java.lang.Exception { + super.mdbMsgClearBodyQueueMapTest(); + } + + @Test + @Override + public void mdbMsgClearBodyQueueBytesTest() throws java.lang.Exception { + super.mdbMsgClearBodyQueueBytesTest(); + } + + @Test + @Override + public void mdbMsgClearBodyQueueStreamTest() throws java.lang.Exception { + super.mdbMsgClearBodyQueueStreamTest(); + } + + @Test + @Override + public void mdbMsgResetQueueTest() throws java.lang.Exception { + super.mdbMsgResetQueueTest(); + } + + @Test + @Override + public void mdbReadNullCharNotValidQueueMapTest() throws java.lang.Exception { + super.mdbReadNullCharNotValidQueueMapTest(); + } + + @Test + @Override + public void mdbReadNullCharNotValidQueueStreamTest() throws java.lang.Exception { + super.mdbReadNullCharNotValidQueueStreamTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java new file mode 100644 index 0000000000..debd4487cb --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java @@ -0,0 +1,217 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT1; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT1.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT1.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgTypesT1: + mdb_msgTypesT1_client: jar.sun-application-client.xml + mdb_msgTypesT1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgTypesT1", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgTypesT1_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesT1_client.jar"); + // The class files + mdb_msgTypesT1_client.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT1.MDBClient.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_client.xml"); + if(resURL != null) { + mdb_msgTypesT1_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgTypesT1_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgTypesT1_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgTypesT1_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgTypesT1_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesT1_ejb.jar"); + // The class files + mdb_msgTypesT1_ejb.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT1.MsgBeanMsgTestT1.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.xml"); + if(ejbResURL != null) { + mdb_msgTypesT1_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgTypesT1_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgTypesT1_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgTypesT1_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgTypesT1.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgTypesT1_ear.addAsModule(mdb_msgTypesT1_ejb); + mdb_msgTypesT1_ear.addAsModule(mdb_msgTypesT1_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/"); + if(earResURL != null) { + mdb_msgTypesT1_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgTypesT1_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgTypesT1_ear, MDBClient.class, earResURL); + return mdb_msgTypesT1_ear; + } + + @Test + @Override + public void mdbBytesMsgNullStreamTopicTest() throws java.lang.Exception { + super.mdbBytesMsgNullStreamTopicTest(); + } + + @Test + @Override + public void mdbBytesMessageTopicTestsFullMsg() throws java.lang.Exception { + super.mdbBytesMessageTopicTestsFullMsg(); + } + + @Test + @Override + public void mdbMapMessageFullMsgTopicTest() throws java.lang.Exception { + super.mdbMapMessageFullMsgTopicTest(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsByte() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsByte(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsShort() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsShort(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsChar() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsChar(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsInt() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsInt(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsLong() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsLong(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsFloat(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsDouble(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsString() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsString(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsBytes(); + } + + @Test + @Override + public void mdbMapMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.mdbMapMessageConversionTopicTestsInvFormatString(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java new file mode 100644 index 0000000000..9aaf4735af --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java @@ -0,0 +1,217 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT2; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT2.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT2.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgTypesT2: + mdb_msgTypesT2_client: jar.sun-application-client.xml + mdb_msgTypesT2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgTypesT2", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgTypesT2_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesT2_client.jar"); + // The class files + mdb_msgTypesT2_client.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT2.MDBClient.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_client.xml"); + if(resURL != null) { + mdb_msgTypesT2_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgTypesT2_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgTypesT2_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgTypesT2_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgTypesT2_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesT2_ejb.jar"); + // The class files + mdb_msgTypesT2_ejb.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT2.MsgBeanMsgTestT2.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.xml"); + if(ejbResURL != null) { + mdb_msgTypesT2_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgTypesT2_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgTypesT2_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgTypesT2_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgTypesT2.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgTypesT2_ear.addAsModule(mdb_msgTypesT2_ejb); + mdb_msgTypesT2_ear.addAsModule(mdb_msgTypesT2_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/"); + if(earResURL != null) { + mdb_msgTypesT2_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgTypesT2_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgTypesT2_ear, MDBClient.class, earResURL); + return mdb_msgTypesT2_ear; + } + + @Test + @Override + public void mdbMessageObjectCopyTopicTest() throws java.lang.Exception { + super.mdbMessageObjectCopyTopicTest(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsBoolean() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsBoolean(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsByte() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsByte(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsShort() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsShort(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsInt() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsInt(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsLong() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsLong(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsFloat() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsFloat(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsDouble() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsDouble(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsString() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsString(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsChar() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsChar(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsBytes() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsBytes(); + } + + @Test + @Override + public void mdbStreamMessageConversionTopicTestsInvFormatString() throws java.lang.Exception { + super.mdbStreamMessageConversionTopicTestsInvFormatString(); + } + + @Test + @Override + public void mdbStreamMessageTopicTestsFullMsg() throws java.lang.Exception { + super.mdbStreamMessageTopicTestsFullMsg(); + } + + @Test + @Override + public void mdbStreamMessageTopicTestNull() throws java.lang.Exception { + super.mdbStreamMessageTopicTestNull(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java new file mode 100644 index 0000000000..ea5c38b374 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java @@ -0,0 +1,181 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT3; + +import com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT3.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT3.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msgTypesT3: + mdb_msgTypesT3_client: jar.sun-application-client.xml + mdb_msgTypesT3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msgTypesT3", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msgTypesT3_client = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesT3_client.jar"); + // The class files + mdb_msgTypesT3_client.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT3.MDBClient.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_client.xml"); + if(resURL != null) { + mdb_msgTypesT3_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msgTypesT3_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msgTypesT3_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msgTypesT3_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msgTypesT3_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msgTypesT3_ejb.jar"); + // The class files + mdb_msgTypesT3_ejb.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT3.MsgBeanMsgTestT3.class, + com.sun.ts.tests.jms.common.JmsUtil.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.xml"); + if(ejbResURL != null) { + mdb_msgTypesT3_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msgTypesT3_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msgTypesT3_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msgTypesT3_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msgTypesT3.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msgTypesT3_ear.addAsModule(mdb_msgTypesT3_ejb); + mdb_msgTypesT3_ear.addAsModule(mdb_msgTypesT3_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/"); + if(earResURL != null) { + mdb_msgTypesT3_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msgTypesT3_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msgTypesT3_ear, MDBClient.class, earResURL); + return mdb_msgTypesT3_ear; + } + + @Test + @Override + public void mdbMsgClearBodyTopicTextTest() throws java.lang.Exception { + super.mdbMsgClearBodyTopicTextTest(); + } + + @Test + @Override + public void mdbMsgClearBodyTopicObjectTest() throws java.lang.Exception { + super.mdbMsgClearBodyTopicObjectTest(); + } + + @Test + @Override + public void mdbMsgClearBodyTopicMapTest() throws java.lang.Exception { + super.mdbMsgClearBodyTopicMapTest(); + } + + @Test + @Override + public void mdbMsgClearBodyTopicBytesTest() throws java.lang.Exception { + super.mdbMsgClearBodyTopicBytesTest(); + } + + @Test + @Override + public void mdbMsgClearBodyTopicStreamTest() throws java.lang.Exception { + super.mdbMsgClearBodyTopicStreamTest(); + } + + @Test + @Override + public void mdbMsgResetTopicTest() throws java.lang.Exception { + super.mdbMsgResetTopicTest(); + } + + @Test + @Override + public void mdbReadNullCharNotValidTopicMapTest() throws java.lang.Exception { + super.mdbReadNullCharNotValidTopicMapTest(); + } + + @Test + @Override + public void mdbReadNullCharNotValidTopicStreamTest() throws java.lang.Exception { + super.mdbReadNullCharNotValidTopicStreamTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java new file mode 100644 index 0000000000..3ea8e75456 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java @@ -0,0 +1,194 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_rec; + +import com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_asynch_receives: + mdb_asynch_receives_client: jar.sun-application-client.xml + mdb_asynch_receives_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_asynch_receives", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_asynch_receives_client = ShrinkWrap.create(JavaArchive.class, "mdb_asynch_receives_client.jar"); + // The class files + mdb_asynch_receives_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDB_AR_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDBClient.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_client.xml"); + if(resURL != null) { + mdb_asynch_receives_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_asynch_receives_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_asynch_receives_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_asynch_receives_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_asynch_receives_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_asynch_receives_ejb.jar"); + // The class files + mdb_asynch_receives_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_rec.MsgBeanForTopic.class, + com.sun.ts.tests.jms.ee.mdb.mdb_rec.MsgBeanForQueue.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDB_AR_Test.class, + com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDB_AR_TestEJB.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.xml"); + if(ejbResURL != null) { + mdb_asynch_receives_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_asynch_receives_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_asynch_receives_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_asynch_receives_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_asynch_receives.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_asynch_receives_ear.addAsModule(mdb_asynch_receives_ejb); + mdb_asynch_receives_ear.addAsModule(mdb_asynch_receives_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/"); + if(earResURL != null) { + mdb_asynch_receives_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_asynch_receives_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_asynch_receives_ear, MDBClient.class, earResURL); + return mdb_asynch_receives_ear; + } + + @Test + @Override + public void asynRecTextMsgQueueTest() throws java.lang.Exception { + super.asynRecTextMsgQueueTest(); + } + + @Test + @Override + public void asynRecMapMsgQueueTest() throws java.lang.Exception { + super.asynRecMapMsgQueueTest(); + } + + @Test + @Override + public void asynRecObjectMsgQueueTest() throws java.lang.Exception { + super.asynRecObjectMsgQueueTest(); + } + + @Test + @Override + public void asynRecTextMsgTopicTest() throws java.lang.Exception { + super.asynRecTextMsgTopicTest(); + } + + @Test + @Override + public void asynRecBytesMsgQueueTest() throws java.lang.Exception { + super.asynRecBytesMsgQueueTest(); + } + + @Test + @Override + public void asynRecStreamMsgQueueTest() throws java.lang.Exception { + super.asynRecStreamMsgQueueTest(); + } + + @Test + @Override + public void asynRecMapMsgTopicTest() throws java.lang.Exception { + super.asynRecMapMsgTopicTest(); + } + + @Test + @Override + public void asynRecObjectMsgTopicTest() throws java.lang.Exception { + super.asynRecObjectMsgTopicTest(); + } + + @Test + @Override + public void asynRecBytesMsgTopicTest() throws java.lang.Exception { + super.asynRecBytesMsgTopicTest(); + } + + @Test + @Override + public void asynRecStreamMsgTopicTest() throws java.lang.Exception { + super.asynRecStreamMsgTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java new file mode 100644 index 0000000000..d8ddfd184f --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java @@ -0,0 +1,163 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_sndQ; + +import com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_sndQ: + mdb_sndQ_client: jar.sun-application-client.xml + mdb_sndQ_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_sndQ", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_sndQ_client = ShrinkWrap.create(JavaArchive.class, "mdb_sndQ_client.jar"); + // The class files + mdb_sndQ_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDB_SNDQ_Test.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDBClient.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_client.xml"); + if(resURL != null) { + mdb_sndQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_sndQ_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_sndQ_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_sndQ_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_sndQ_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_sndQ_ejb.jar"); + // The class files + mdb_sndQ_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MsgBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDB_SNDQ_Test.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDB_SNDQ_TestEJB.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.xml"); + if(ejbResURL != null) { + mdb_sndQ_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_sndQ_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_sndQ_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_sndQ_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_sndQ.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_sndQ_ear.addAsModule(mdb_sndQ_ejb); + mdb_sndQ_ear.addAsModule(mdb_sndQ_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/"); + if(earResURL != null) { + mdb_sndQ_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_sndQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_sndQ_ear, MDBClient.class, earResURL); + return mdb_sndQ_ear; + } + + @Test + @Override + public void mdbSendTextMsgTest() throws java.lang.Exception { + super.mdbSendTextMsgTest(); + } + + @Test + @Override + public void mdbSendBytesMsgTest() throws java.lang.Exception { + super.mdbSendBytesMsgTest(); + } + + @Test + @Override + public void mdbSendMapMsgTest() throws java.lang.Exception { + super.mdbSendMapMsgTest(); + } + + @Test + @Override + public void mdbSendStreamMsgTest() throws java.lang.Exception { + super.mdbSendStreamMsgTest(); + } + + @Test + @Override + public void mdbSendObjectMsgTest() throws java.lang.Exception { + super.mdbSendObjectMsgTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java new file mode 100644 index 0000000000..e82d33abfc --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java @@ -0,0 +1,163 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_sndToQueue; + +import com.sun.ts.tests.jms.ee.mdb.mdb_sndToQueue.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_sndToQueue.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_sndToQueue: + mdb_sndToQueue_client: jar.sun-application-client.xml + mdb_sndToQueue_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_sndToQueue", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_sndToQueue_client = ShrinkWrap.create(JavaArchive.class, "mdb_sndToQueue_client.jar"); + // The class files + mdb_sndToQueue_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndToQueue.MDBClient.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_client.xml"); + if(resURL != null) { + mdb_sndToQueue_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_sndToQueue_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_sndToQueue_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_sndToQueue_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_sndToQueue_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_sndToQueue_ejb.jar"); + // The class files + mdb_sndToQueue_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_sndToQueue.MsgBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.commonee.MDB_Q_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_Q_Test.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.xml"); + if(ejbResURL != null) { + mdb_sndToQueue_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_sndToQueue_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_sndToQueue_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_sndToQueue_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_sndToQueue.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_sndToQueue_ear.addAsModule(mdb_sndToQueue_ejb); + mdb_sndToQueue_ear.addAsModule(mdb_sndToQueue_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/"); + if(earResURL != null) { + mdb_sndToQueue_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_sndToQueue_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_sndToQueue_ear, MDBClient.class, earResURL); + return mdb_sndToQueue_ear; + } + + @Test + @Override + public void mdbSendTextMsgToQueueTest() throws java.lang.Exception { + super.mdbSendTextMsgToQueueTest(); + } + + @Test + @Override + public void mdbSendBytesMsgToQueueTest() throws java.lang.Exception { + super.mdbSendBytesMsgToQueueTest(); + } + + @Test + @Override + public void mdbSendMapMsgToQueueTest() throws java.lang.Exception { + super.mdbSendMapMsgToQueueTest(); + } + + @Test + @Override + public void mdbSendStreamMsgToQueueTest() throws java.lang.Exception { + super.mdbSendStreamMsgToQueueTest(); + } + + @Test + @Override + public void mdbSendObjectMsgToQueueTest() throws java.lang.Exception { + super.mdbSendObjectMsgToQueueTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java new file mode 100644 index 0000000000..7c541bfb70 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java @@ -0,0 +1,164 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic; + +import com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_sndToTopic: + mdb_sndToTopic_client: jar.sun-application-client.xml + mdb_sndToTopic_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_sndToTopic", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_sndToTopic_client = ShrinkWrap.create(JavaArchive.class, "mdb_sndToTopic_client.jar"); + // The class files + mdb_sndToTopic_client.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic.MDBClient.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_client.xml"); + if(resURL != null) { + mdb_sndToTopic_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_sndToTopic_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_sndToTopic_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_sndToTopic_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_sndToTopic_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_sndToTopic_ejb.jar"); + // The class files + mdb_sndToTopic_ejb.addClasses( + com.sun.ts.tests.jms.commonee.MDB_T_TestEJB.class, + com.sun.ts.tests.jms.commonee.MDB_T_Test.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic.MsgBeanToTopic.class, + com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic.MsgBeanTopic.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.xml"); + if(ejbResURL != null) { + mdb_sndToTopic_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_sndToTopic_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_sndToTopic_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_sndToTopic_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_sndToTopic.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_sndToTopic_ear.addAsModule(mdb_sndToTopic_ejb); + mdb_sndToTopic_ear.addAsModule(mdb_sndToTopic_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/"); + if(earResURL != null) { + mdb_sndToTopic_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_sndToTopic_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_sndToTopic_ear, MDBClient.class, earResURL); + return mdb_sndToTopic_ear; + } + + @Test + @Override + public void mdbSendTextMsgToTopicTest() throws java.lang.Exception { + super.mdbSendTextMsgToTopicTest(); + } + + @Test + @Override + public void mdbSendBytesMsgToTopicTest() throws java.lang.Exception { + super.mdbSendBytesMsgToTopicTest(); + } + + @Test + @Override + public void mdbSendMapMsgToTopicTest() throws java.lang.Exception { + super.mdbSendMapMsgToTopicTest(); + } + + @Test + @Override + public void mdbSendStreamMsgToTopicTest() throws java.lang.Exception { + super.mdbSendStreamMsgToTopicTest(); + } + + @Test + @Override + public void mdbSendObjectMsgToTopicTest() throws java.lang.Exception { + super.mdbSendObjectMsgToTopicTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java new file mode 100644 index 0000000000..dbd60fbd33 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java @@ -0,0 +1,137 @@ +package com.sun.ts.tests.jms.ee.mdb.mdb_synchrec; + +import com.sun.ts.tests.jms.ee.mdb.mdb_synchrec.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.mdb_synchrec.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_synchrec: + mdb_synchrec_client: META-INF/application-client.xml,jar.sun-application-client.xml + mdb_synchrec_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_client.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_synchrec", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_synchrec_client = ShrinkWrap.create(JavaArchive.class, "mdb_synchrec_client.jar"); + // The class files + mdb_synchrec_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.mdb_synchrec.MDBClient.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_client.xml"); + if(resURL != null) { + mdb_synchrec_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_synchrec_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_synchrec_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_synchrec_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_synchrec_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_synchrec_ejb.jar"); + // The class files + mdb_synchrec_ejb.addClasses( + com.sun.ts.tests.jms.ee.mdb.mdb_synchrec.MsgBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.xml"); + if(ejbResURL != null) { + mdb_synchrec_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_synchrec_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_synchrec_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_synchrec_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_synchrec.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_synchrec_ear.addAsModule(mdb_synchrec_ejb); + mdb_synchrec_ear.addAsModule(mdb_synchrec_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/"); + if(earResURL != null) { + mdb_synchrec_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_synchrec_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_synchrec_ear, MDBClient.class, earResURL); + return mdb_synchrec_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java new file mode 100644 index 0000000000..e6fe7979ca --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java @@ -0,0 +1,192 @@ +package com.sun.ts.tests.jms.ee.mdb.xa; + +import com.sun.ts.tests.jms.ee.mdb.xa.MDBClient; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee.mdb.xa.MDBClient { + /** + EE10 Deployment Descriptors: + mdb_msg_xa: + mdb_msg_xa_client: META-INF/application-client.xml,jar.sun-application-client.xml + mdb_msg_xa_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_client.xml + /com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_ejb.xml + /com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "mdb_msg_xa", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive mdb_msg_xa_client = ShrinkWrap.create(JavaArchive.class, "mdb_msg_xa_client.jar"); + // The class files + mdb_msg_xa_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee.mdb.xa.MDBClient.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = MDBClient.class.getResource("com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_client.xml"); + if(resURL != null) { + mdb_msg_xa_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_client.jar.sun-application-client.xml"); + if(resURL != null) { + mdb_msg_xa_client.addAsManifestResource(resURL, "application-client.xml"); + } + mdb_msg_xa_client.addAsManifestResource(new StringAsset("Main-Class: " + MDBClient.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(mdb_msg_xa_client, MDBClient.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive mdb_msg_xa_ejb = ShrinkWrap.create(JavaArchive.class, "mdb_msg_xa_ejb.jar"); + // The class files + mdb_msg_xa_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee.mdb.xa.MsgBeanxa.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_ejb.xml"); + if(ejbResURL != null) { + mdb_msg_xa_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/mdb_msg_xa_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + mdb_msg_xa_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(mdb_msg_xa_ejb, MDBClient.class, ejbResURL); + + // Ear + EnterpriseArchive mdb_msg_xa_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdb_msg_xa.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + mdb_msg_xa_ear.addAsModule(mdb_msg_xa_ejb); + mdb_msg_xa_ear.addAsModule(mdb_msg_xa_client); + + + + // The application.xml descriptor + URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/"); + if(earResURL != null) { + mdb_msg_xa_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/.ear.sun-application.xml"); + if(earResURL != null) { + mdb_msg_xa_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(mdb_msg_xa_ear, MDBClient.class, earResURL); + return mdb_msg_xa_ear; + } + + @Test + @Override + public void Test1() throws java.lang.Exception { + super.Test1(); + } + + @Test + @Override + public void Test2() throws java.lang.Exception { + super.Test2(); + } + + @Test + @Override + public void Test3() throws java.lang.Exception { + super.Test3(); + } + + @Test + @Override + public void Test4() throws java.lang.Exception { + super.Test4(); + } + + @Test + @Override + public void Test5() throws java.lang.Exception { + super.Test5(); + } + + @Test + @Override + public void Test6() throws java.lang.Exception { + super.Test6(); + } + + @Test + @Override + public void Test7() throws java.lang.Exception { + super.Test7(); + } + + @Test + @Override + public void Test8() throws java.lang.Exception { + super.Test8(); + } + + @Test + @Override + public void Test9() throws java.lang.Exception { + super.Test9(); + } + + @Test + @Override + public void Test10() throws java.lang.Exception { + super.Test10(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java new file mode 100644 index 0000000000..534079d8c5 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java @@ -0,0 +1,247 @@ +package com.sun.ts.tests.jms.ee20.cditests.ejbweb; + +import com.sun.ts.tests.jms.ee20.cditests.ejbweb.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.cditests.ejbweb.Client { + /** + EE10 Deployment Descriptors: + cditestsejbweb: META-INF/application.xml + cditestsejbweb_client: + cditestsejbweb_ejb: META-INF/beans.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + cditestsejbweb_web: WEB-INF/beans.xml,WEB-INF/web.xml,war.sun-web.xml + + Found Descriptors: + Client: + + Ejb: + + /com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_ejb.xml + /com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_ejb.jar.sun-ejb-jar.xml + War: + + /com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_web.xml + /com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_web.war.sun-web.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "cditestsejbweb", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive cditestsejbweb_web = ShrinkWrap.create(WebArchive.class, "cditestsejbweb_web.war"); + // The class files + cditestsejbweb_web.addClasses( + com.sun.ts.tests.jms.ee20.cditests.ejbweb.ServletClient.class, + com.sun.ts.tests.jms.ee20.cditests.ejbweb.MyManagedBean.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_web.xml"); + if(warResURL != null) { + cditestsejbweb_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_web.war.sun-web.xml"); + if(warResURL != null) { + cditestsejbweb_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_web.xml"); + if(warResURL != null) { + cditestsejbweb_web.addAsWebResource(warResURL, "//cditestsejbweb_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/resources/beans.xml"); + if(warResURL != null) { + cditestsejbweb_web.addAsWebResource(warResURL, "/WEB-INF/beans.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(cditestsejbweb_web, Client.class, warResURL); + + // Client + // the jar with the correct archive name + JavaArchive cditestsejbweb_client = ShrinkWrap.create(JavaArchive.class, "cditestsejbweb_client.jar"); + // The class files + cditestsejbweb_client.addClasses( + com.sun.ts.tests.jms.ee20.cditests.ejbweb.EjbClientIF.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.cditests.ejbweb.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/ejbweb/"); + if(resURL != null) { + cditestsejbweb_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/ejbweb/.jar.sun-application-client.xml"); + if(resURL != null) { + cditestsejbweb_client.addAsManifestResource(resURL, "application-client.xml"); + } + cditestsejbweb_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(cditestsejbweb_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive cditestsejbweb_ejb = ShrinkWrap.create(JavaArchive.class, "cditestsejbweb_ejb.jar"); + // The class files + cditestsejbweb_ejb.addClasses( + com.sun.ts.tests.jms.ee20.cditests.ejbweb.EjbClientIF.class, + com.sun.ts.tests.jms.ee20.cditests.ejbweb.EjbClient.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_ejb.xml"); + if(ejbResURL != null) { + cditestsejbweb_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/ejbweb/cditestsejbweb_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + cditestsejbweb_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(cditestsejbweb_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive cditestsejbweb_ear = ShrinkWrap.create(EnterpriseArchive.class, "cditestsejbweb.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + cditestsejbweb_ear.addAsModule(cditestsejbweb_ejb); + cditestsejbweb_ear.addAsModule(cditestsejbweb_client); + cditestsejbweb_ear.addAsModule(cditestsejbweb_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/./application.xml"); + if(earResURL != null) { + cditestsejbweb_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/./application.ear.sun-application.xml"); + if(earResURL != null) { + cditestsejbweb_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(cditestsejbweb_ear, Client.class, earResURL); + return cditestsejbweb_ear; + } + + @Test + @Override + public void sendRecvQueueTestUsingCDIFromServlet() throws java.lang.Exception { + super.sendRecvQueueTestUsingCDIFromServlet(); + } + + @Test + @Override + public void sendRecvTopicTestUsingCDIFromServlet() throws java.lang.Exception { + super.sendRecvTopicTestUsingCDIFromServlet(); + } + + @Test + @Override + public void sendRecvUsingCDIDefaultFactoryFromServlet() throws java.lang.Exception { + super.sendRecvUsingCDIDefaultFactoryFromServlet(); + } + + @Test + @Override + public void verifySessionModeOnCDIJMSContextFromServlet() throws java.lang.Exception { + super.verifySessionModeOnCDIJMSContextFromServlet(); + } + + @Test + @Override + public void testRestrictionsOnCDIJMSContextFromServlet() throws java.lang.Exception { + super.testRestrictionsOnCDIJMSContextFromServlet(); + } + + @Test + @Override + public void sendRecvQueueTestUsingCDIFromEjb() throws java.lang.Exception { + super.sendRecvQueueTestUsingCDIFromEjb(); + } + + @Test + @Override + public void sendRecvTopicTestUsingCDIFromEjb() throws java.lang.Exception { + super.sendRecvTopicTestUsingCDIFromEjb(); + } + + @Test + @Override + public void sendRecvUsingCDIDefaultFactoryFromEjb() throws java.lang.Exception { + super.sendRecvUsingCDIDefaultFactoryFromEjb(); + } + + @Test + @Override + public void verifySessionModeOnCDIJMSContextFromEjb() throws java.lang.Exception { + super.verifySessionModeOnCDIJMSContextFromEjb(); + } + + @Test + @Override + public void testRestrictionsOnCDIJMSContextFromEjb() throws java.lang.Exception { + super.testRestrictionsOnCDIJMSContextFromEjb(); + } + + @Test + @Override + public void testActiveJTAUsingCDIAcross2MethodsFromEjb() throws java.lang.Exception { + super.testActiveJTAUsingCDIAcross2MethodsFromEjb(); + } + + @Test + @Override + public void sendRecvQueueTestUsingCDIFromManagedBean() throws java.lang.Exception { + super.sendRecvQueueTestUsingCDIFromManagedBean(); + } + + @Test + @Override + public void sendRecvTopicTestUsingCDIFromManagedBean() throws java.lang.Exception { + super.sendRecvTopicTestUsingCDIFromManagedBean(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java new file mode 100644 index 0000000000..cd91477071 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java @@ -0,0 +1,142 @@ +package com.sun.ts.tests.jms.ee20.cditests.mdb; + +import com.sun.ts.tests.jms.ee20.cditests.mdb.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.cditests.mdb.Client { + /** + EE10 Deployment Descriptors: + cditestsmdb: META-INF/application.xml + cditestsmdb_client: + cditestsmdb_ejb: META-INF/beans.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + Ejb: + + /com/sun/ts/tests/jms/ee20/cditests/mdb/cditestsmdb_ejb.xml + /com/sun/ts/tests/jms/ee20/cditests/mdb/cditestsmdb_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "cditestsmdb", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive cditestsmdb_client = ShrinkWrap.create(JavaArchive.class, "cditestsmdb_client.jar"); + // The class files + cditestsmdb_client.addClasses( + com.sun.ts.tests.jms.ee20.cditests.mdb.EjbClientIF.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.cditests.mdb.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/mdb/"); + if(resURL != null) { + cditestsmdb_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/mdb/.jar.sun-application-client.xml"); + if(resURL != null) { + cditestsmdb_client.addAsManifestResource(resURL, "application-client.xml"); + } + cditestsmdb_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(cditestsmdb_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive cditestsmdb_ejb = ShrinkWrap.create(JavaArchive.class, "cditestsmdb_ejb.jar"); + // The class files + cditestsmdb_ejb.addClasses( + com.sun.ts.tests.jms.ee20.cditests.mdb.EjbClientIF.class, + com.sun.ts.tests.jms.ee20.cditests.mdb.MsgBeanQ.class, + com.sun.ts.tests.jms.ee20.cditests.mdb.EjbClient.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/mdb/cditestsmdb_ejb.xml"); + if(ejbResURL != null) { + cditestsmdb_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/mdb/cditestsmdb_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + cditestsmdb_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(cditestsmdb_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive cditestsmdb_ear = ShrinkWrap.create(EnterpriseArchive.class, "cditestsmdb.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + cditestsmdb_ear.addAsModule(cditestsmdb_ejb); + cditestsmdb_ear.addAsModule(cditestsmdb_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/./application.xml"); + if(earResURL != null) { + cditestsmdb_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/./application.ear.sun-application.xml"); + if(earResURL != null) { + cditestsmdb_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(cditestsmdb_ear, Client.class, earResURL); + return cditestsmdb_ear; + } + + @Test + @Override + public void testCDIInjectionOfMDBWithQueueReplyFromEjb() throws java.lang.Exception { + super.testCDIInjectionOfMDBWithQueueReplyFromEjb(); + } + + @Test + @Override + public void testCDIInjectionOfMDBWithTopicReplyFromEjb() throws java.lang.Exception { + super.testCDIInjectionOfMDBWithTopicReplyFromEjb(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java new file mode 100644 index 0000000000..817d098261 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java @@ -0,0 +1,198 @@ +package com.sun.ts.tests.jms.ee20.cditests.usecases; + +import com.sun.ts.tests.jms.ee20.cditests.usecases.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.cditests.usecases.Client { + /** + EE10 Deployment Descriptors: + cditestsusecases: META-INF/application.xml + cditestsusecases_client: + cditestsusecases_ejb: META-INF/beans.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + Ejb: + + /com/sun/ts/tests/jms/ee20/cditests/usecases/cditestsusecases_ejb.xml + /com/sun/ts/tests/jms/ee20/cditests/usecases/cditestsusecases_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "cditestsusecases", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive cditestsusecases_client = ShrinkWrap.create(JavaArchive.class, "cditestsusecases_client.jar"); + // The class files + cditestsusecases_client.addClasses( + com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean1IF.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.Client.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.BMBean1IF.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.BMBean2IF.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean2IF.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/usecases/"); + if(resURL != null) { + cditestsusecases_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/usecases/.jar.sun-application-client.xml"); + if(resURL != null) { + cditestsusecases_client.addAsManifestResource(resURL, "application-client.xml"); + } + cditestsusecases_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(cditestsusecases_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive cditestsusecases_ejb = ShrinkWrap.create(JavaArchive.class, "cditestsusecases_ejb.jar"); + // The class files + cditestsusecases_ejb.addClasses( + com.sun.ts.tests.jms.ee20.cditests.usecases.BMBean1.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean1IF.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean2.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.BMBean1IF.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.BMBean2.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.BMBean2IF.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean1.class, + com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean2IF.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/usecases/cditestsusecases_ejb.xml"); + if(ejbResURL != null) { + cditestsusecases_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/usecases/cditestsusecases_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + cditestsusecases_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(cditestsusecases_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive cditestsusecases_ear = ShrinkWrap.create(EnterpriseArchive.class, "cditestsusecases.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + cditestsusecases_ear.addAsModule(cditestsusecases_ejb); + cditestsusecases_ear.addAsModule(cditestsusecases_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/./application.xml"); + if(earResURL != null) { + cditestsusecases_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/./application.ear.sun-application.xml"); + if(earResURL != null) { + cditestsusecases_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(cditestsusecases_ear, Client.class, earResURL); + return cditestsusecases_ear; + } + + @Test + @Override + public void beanUseCaseA() throws java.lang.Exception { + super.beanUseCaseA(); + } + + @Test + @Override + public void beanUseCaseB() throws java.lang.Exception { + super.beanUseCaseB(); + } + + @Test + @Override + public void beanUseCaseC() throws java.lang.Exception { + super.beanUseCaseC(); + } + + @Test + @Override + public void beanUseCaseD() throws java.lang.Exception { + super.beanUseCaseD(); + } + + @Test + @Override + public void beanUseCaseE() throws java.lang.Exception { + super.beanUseCaseE(); + } + + @Test + @Override + public void beanUseCaseF() throws java.lang.Exception { + super.beanUseCaseF(); + } + + @Test + @Override + public void beanUseCaseG() throws java.lang.Exception { + super.beanUseCaseG(); + } + + @Test + @Override + public void beanUseCaseH() throws java.lang.Exception { + super.beanUseCaseH(); + } + + @Test + @Override + public void beanUseCaseJ() throws java.lang.Exception { + super.beanUseCaseJ(); + } + + @Test + @Override + public void beanUseCaseK() throws java.lang.Exception { + super.beanUseCaseK(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java new file mode 100644 index 0000000000..f41cae0164 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java @@ -0,0 +1,155 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.annotated; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.annotated.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.annotated.Client { + /** + EE10 Deployment Descriptors: + queue_selectorauto_annotated: + queue_selectorauto_annotated_client: jar.sun-application-client.xml,jar.sun-application-client.xml + queue_selectorauto_annotated_ejb: jar.sun-ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/queue_selectorauto_annotated_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/queue_selectorauto_annotated_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "queue_selectorauto_annotated", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queue_selectorauto_annotated_client = ShrinkWrap.create(JavaArchive.class, "queue_selectorauto_annotated_client.jar"); + // The class files + queue_selectorauto_annotated_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.annotated.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/queue_selectorauto_annotated_client.xml"); + if(resURL != null) { + queue_selectorauto_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/queue_selectorauto_annotated_client.jar.sun-application-client.xml"); + if(resURL != null) { + queue_selectorauto_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + queue_selectorauto_annotated_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queue_selectorauto_annotated_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queue_selectorauto_annotated_ejb = ShrinkWrap.create(JavaArchive.class, "queue_selectorauto_annotated_ejb.jar"); + // The class files + queue_selectorauto_annotated_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.annotated.ActivationConfigBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/queue_selectorauto_annotated_ejb.xml"); + if(ejbResURL != null) { + queue_selectorauto_annotated_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/queue_selectorauto_annotated_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queue_selectorauto_annotated_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queue_selectorauto_annotated_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive queue_selectorauto_annotated_ear = ShrinkWrap.create(EnterpriseArchive.class, "queue_selectorauto_annotated.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queue_selectorauto_annotated_ear.addAsModule(queue_selectorauto_annotated_ejb); + queue_selectorauto_annotated_ear.addAsModule(queue_selectorauto_annotated_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/application.xml"); + if(earResURL != null) { + queue_selectorauto_annotated_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/application.ear.sun-application.xml"); + if(earResURL != null) { + queue_selectorauto_annotated_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queue_selectorauto_annotated_ear, Client.class, earResURL); + return queue_selectorauto_annotated_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java new file mode 100644 index 0000000000..6a58e74352 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java @@ -0,0 +1,156 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor.Client { + /** + EE10 Deployment Descriptors: + queue_selectorauto_descriptor: + queue_selectorauto_descriptor_client: jar.sun-application-client.xml,jar.sun-application-client.xml + queue_selectorauto_descriptor_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_ejb.xml + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "queue_selectorauto_descriptor", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queue_selectorauto_descriptor_client = ShrinkWrap.create(JavaArchive.class, "queue_selectorauto_descriptor_client.jar"); + // The class files + queue_selectorauto_descriptor_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_client.xml"); + if(resURL != null) { + queue_selectorauto_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_client.jar.sun-application-client.xml"); + if(resURL != null) { + queue_selectorauto_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + queue_selectorauto_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queue_selectorauto_descriptor_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queue_selectorauto_descriptor_ejb = ShrinkWrap.create(JavaArchive.class, "queue_selectorauto_descriptor_ejb.jar"); + // The class files + queue_selectorauto_descriptor_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor.ActivationConfigBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_ejb.xml"); + if(ejbResURL != null) { + queue_selectorauto_descriptor_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/queue_selectorauto_descriptor_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queue_selectorauto_descriptor_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queue_selectorauto_descriptor_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive queue_selectorauto_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "queue_selectorauto_descriptor.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queue_selectorauto_descriptor_ear.addAsModule(queue_selectorauto_descriptor_ejb); + queue_selectorauto_descriptor_ear.addAsModule(queue_selectorauto_descriptor_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/application.xml"); + if(earResURL != null) { + queue_selectorauto_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/application.ear.sun-application.xml"); + if(earResURL != null) { + queue_selectorauto_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queue_selectorauto_descriptor_ear, Client.class, earResURL); + return queue_selectorauto_descriptor_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java new file mode 100644 index 0000000000..9116fa5e02 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java @@ -0,0 +1,155 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.annotated; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.annotated.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.annotated.Client { + /** + EE10 Deployment Descriptors: + queue_selectordups_annotated: + queue_selectordups_annotated_client: jar.sun-application-client.xml,jar.sun-application-client.xml + queue_selectordups_annotated_ejb: jar.sun-ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/queue_selectordups_annotated_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/queue_selectordups_annotated_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "queue_selectordups_annotated", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queue_selectordups_annotated_client = ShrinkWrap.create(JavaArchive.class, "queue_selectordups_annotated_client.jar"); + // The class files + queue_selectordups_annotated_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.annotated.Client.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/queue_selectordups_annotated_client.xml"); + if(resURL != null) { + queue_selectordups_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/queue_selectordups_annotated_client.jar.sun-application-client.xml"); + if(resURL != null) { + queue_selectordups_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + queue_selectordups_annotated_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queue_selectordups_annotated_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queue_selectordups_annotated_ejb = ShrinkWrap.create(JavaArchive.class, "queue_selectordups_annotated_ejb.jar"); + // The class files + queue_selectordups_annotated_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.annotated.ActivationConfigBean.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/queue_selectordups_annotated_ejb.xml"); + if(ejbResURL != null) { + queue_selectordups_annotated_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/queue_selectordups_annotated_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queue_selectordups_annotated_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queue_selectordups_annotated_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive queue_selectordups_annotated_ear = ShrinkWrap.create(EnterpriseArchive.class, "queue_selectordups_annotated.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queue_selectordups_annotated_ear.addAsModule(queue_selectordups_annotated_ejb); + queue_selectordups_annotated_ear.addAsModule(queue_selectordups_annotated_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/application.xml"); + if(earResURL != null) { + queue_selectordups_annotated_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/application.ear.sun-application.xml"); + if(earResURL != null) { + queue_selectordups_annotated_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queue_selectordups_annotated_ear, Client.class, earResURL); + return queue_selectordups_annotated_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java new file mode 100644 index 0000000000..929769d5cf --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java @@ -0,0 +1,156 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.descriptor; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.descriptor.Client { + /** + EE10 Deployment Descriptors: + queue_selectordups_descriptor: + queue_selectordups_descriptor_client: jar.sun-application-client.xml,jar.sun-application-client.xml + queue_selectordups_descriptor_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_ejb.xml + /com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "queue_selectordups_descriptor", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive queue_selectordups_descriptor_client = ShrinkWrap.create(JavaArchive.class, "queue_selectordups_descriptor_client.jar"); + // The class files + queue_selectordups_descriptor_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.descriptor.Client.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_client.xml"); + if(resURL != null) { + queue_selectordups_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_client.jar.sun-application-client.xml"); + if(resURL != null) { + queue_selectordups_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + queue_selectordups_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(queue_selectordups_descriptor_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive queue_selectordups_descriptor_ejb = ShrinkWrap.create(JavaArchive.class, "queue_selectordups_descriptor_ejb.jar"); + // The class files + queue_selectordups_descriptor_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor.ActivationConfigBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_ejb.xml"); + if(ejbResURL != null) { + queue_selectordups_descriptor_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/queue_selectordups_descriptor_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + queue_selectordups_descriptor_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(queue_selectordups_descriptor_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive queue_selectordups_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "queue_selectordups_descriptor.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + queue_selectordups_descriptor_ear.addAsModule(queue_selectordups_descriptor_ejb); + queue_selectordups_descriptor_ear.addAsModule(queue_selectordups_descriptor_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/application.xml"); + if(earResURL != null) { + queue_selectordups_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/application.ear.sun-application.xml"); + if(earResURL != null) { + queue_selectordups_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(queue_selectordups_descriptor_ear, Client.class, earResURL); + return queue_selectordups_descriptor_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java new file mode 100644 index 0000000000..e378fee1a0 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java @@ -0,0 +1,144 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated.Client { + /** + EE10 Deployment Descriptors: + topic_noselnocidautodurable_annotated: + topic_noselnocidautodurable_annotated_client: jar.sun-application-client.xml + topic_noselnocidautodurable_annotated_ejb: jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/topic_noselnocidautodurable_annotated_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/topic_noselnocidautodurable_annotated_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "topic_noselnocidautodurable_annotated", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topic_noselnocidautodurable_annotated_client = ShrinkWrap.create(JavaArchive.class, "topic_noselnocidautodurable_annotated_client.jar"); + // The class files + topic_noselnocidautodurable_annotated_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated.Client.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/topic_noselnocidautodurable_annotated_client.xml"); + if(resURL != null) { + topic_noselnocidautodurable_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/topic_noselnocidautodurable_annotated_client.jar.sun-application-client.xml"); + if(resURL != null) { + topic_noselnocidautodurable_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + topic_noselnocidautodurable_annotated_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topic_noselnocidautodurable_annotated_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topic_noselnocidautodurable_annotated_ejb = ShrinkWrap.create(JavaArchive.class, "topic_noselnocidautodurable_annotated_ejb.jar"); + // The class files + topic_noselnocidautodurable_annotated_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated.ActivationConfigBean.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/topic_noselnocidautodurable_annotated_ejb.xml"); + if(ejbResURL != null) { + topic_noselnocidautodurable_annotated_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/topic_noselnocidautodurable_annotated_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topic_noselnocidautodurable_annotated_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topic_noselnocidautodurable_annotated_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive topic_noselnocidautodurable_annotated_ear = ShrinkWrap.create(EnterpriseArchive.class, "topic_noselnocidautodurable_annotated.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topic_noselnocidautodurable_annotated_ear.addAsModule(topic_noselnocidautodurable_annotated_ejb); + topic_noselnocidautodurable_annotated_ear.addAsModule(topic_noselnocidautodurable_annotated_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/application.xml"); + if(earResURL != null) { + topic_noselnocidautodurable_annotated_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/application.ear.sun-application.xml"); + if(earResURL != null) { + topic_noselnocidautodurable_annotated_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topic_noselnocidautodurable_annotated_ear, Client.class, earResURL); + return topic_noselnocidautodurable_annotated_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java new file mode 100644 index 0000000000..e43a9cebf4 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java @@ -0,0 +1,145 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor.Client { + /** + EE10 Deployment Descriptors: + topic_noselnocidautodurable_descriptor: + topic_noselnocidautodurable_descriptor_client: jar.sun-application-client.xml + topic_noselnocidautodurable_descriptor_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_ejb.xml + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "topic_noselnocidautodurable_descriptor", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topic_noselnocidautodurable_descriptor_client = ShrinkWrap.create(JavaArchive.class, "topic_noselnocidautodurable_descriptor_client.jar"); + // The class files + topic_noselnocidautodurable_descriptor_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor.Client.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_client.xml"); + if(resURL != null) { + topic_noselnocidautodurable_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_client.jar.sun-application-client.xml"); + if(resURL != null) { + topic_noselnocidautodurable_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + topic_noselnocidautodurable_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topic_noselnocidautodurable_descriptor_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topic_noselnocidautodurable_descriptor_ejb = ShrinkWrap.create(JavaArchive.class, "topic_noselnocidautodurable_descriptor_ejb.jar"); + // The class files + topic_noselnocidautodurable_descriptor_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor.ActivationConfigBean.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_ejb.xml"); + if(ejbResURL != null) { + topic_noselnocidautodurable_descriptor_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/topic_noselnocidautodurable_descriptor_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topic_noselnocidautodurable_descriptor_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topic_noselnocidautodurable_descriptor_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive topic_noselnocidautodurable_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "topic_noselnocidautodurable_descriptor.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topic_noselnocidautodurable_descriptor_ear.addAsModule(topic_noselnocidautodurable_descriptor_ejb); + topic_noselnocidautodurable_descriptor_ear.addAsModule(topic_noselnocidautodurable_descriptor_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/application.xml"); + if(earResURL != null) { + topic_noselnocidautodurable_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/application.ear.sun-application.xml"); + if(earResURL != null) { + topic_noselnocidautodurable_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topic_noselnocidautodurable_descriptor_ear, Client.class, earResURL); + return topic_noselnocidautodurable_descriptor_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java new file mode 100644 index 0000000000..8b97bccc64 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java @@ -0,0 +1,156 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.annotated; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.annotated.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.annotated.Client { + /** + EE10 Deployment Descriptors: + topic_selectorautociddurable_annotated: + topic_selectorautociddurable_annotated_client: jar.sun-application-client.xml + topic_selectorautociddurable_annotated_ejb: jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/topic_selectorautociddurable_annotated_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/topic_selectorautociddurable_annotated_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "topic_selectorautociddurable_annotated", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topic_selectorautociddurable_annotated_client = ShrinkWrap.create(JavaArchive.class, "topic_selectorautociddurable_annotated_client.jar"); + // The class files + topic_selectorautociddurable_annotated_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.annotated.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/topic_selectorautociddurable_annotated_client.xml"); + if(resURL != null) { + topic_selectorautociddurable_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/topic_selectorautociddurable_annotated_client.jar.sun-application-client.xml"); + if(resURL != null) { + topic_selectorautociddurable_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + topic_selectorautociddurable_annotated_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topic_selectorautociddurable_annotated_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topic_selectorautociddurable_annotated_ejb = ShrinkWrap.create(JavaArchive.class, "topic_selectorautociddurable_annotated_ejb.jar"); + // The class files + topic_selectorautociddurable_annotated_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.annotated.ActivationConfigBean.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/topic_selectorautociddurable_annotated_ejb.xml"); + if(ejbResURL != null) { + topic_selectorautociddurable_annotated_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/topic_selectorautociddurable_annotated_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topic_selectorautociddurable_annotated_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topic_selectorautociddurable_annotated_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive topic_selectorautociddurable_annotated_ear = ShrinkWrap.create(EnterpriseArchive.class, "topic_selectorautociddurable_annotated.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topic_selectorautociddurable_annotated_ear.addAsModule(topic_selectorautociddurable_annotated_ejb); + topic_selectorautociddurable_annotated_ear.addAsModule(topic_selectorautociddurable_annotated_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/application.xml"); + if(earResURL != null) { + topic_selectorautociddurable_annotated_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/application.ear.sun-application.xml"); + if(earResURL != null) { + topic_selectorautociddurable_annotated_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topic_selectorautociddurable_annotated_ear, Client.class, earResURL); + return topic_selectorautociddurable_annotated_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java new file mode 100644 index 0000000000..ea4246642d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java @@ -0,0 +1,157 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.descriptor; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.descriptor.Client { + /** + EE10 Deployment Descriptors: + topic_selectorautociddurable_descriptor: + topic_selectorautociddurable_descriptor_client: jar.sun-application-client.xml + topic_selectorautociddurable_descriptor_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_ejb.xml + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "topic_selectorautociddurable_descriptor", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topic_selectorautociddurable_descriptor_client = ShrinkWrap.create(JavaArchive.class, "topic_selectorautociddurable_descriptor_client.jar"); + // The class files + topic_selectorautociddurable_descriptor_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.descriptor.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_client.xml"); + if(resURL != null) { + topic_selectorautociddurable_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_client.jar.sun-application-client.xml"); + if(resURL != null) { + topic_selectorautociddurable_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + topic_selectorautociddurable_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topic_selectorautociddurable_descriptor_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topic_selectorautociddurable_descriptor_ejb = ShrinkWrap.create(JavaArchive.class, "topic_selectorautociddurable_descriptor_ejb.jar"); + // The class files + topic_selectorautociddurable_descriptor_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.descriptor.ActivationConfigBean.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_ejb.xml"); + if(ejbResURL != null) { + topic_selectorautociddurable_descriptor_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/topic_selectorautociddurable_descriptor_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topic_selectorautociddurable_descriptor_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topic_selectorautociddurable_descriptor_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive topic_selectorautociddurable_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "topic_selectorautociddurable_descriptor.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topic_selectorautociddurable_descriptor_ear.addAsModule(topic_selectorautociddurable_descriptor_ejb); + topic_selectorautociddurable_descriptor_ear.addAsModule(topic_selectorautociddurable_descriptor_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/application.xml"); + if(earResURL != null) { + topic_selectorautociddurable_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/application.ear.sun-application.xml"); + if(earResURL != null) { + topic_selectorautociddurable_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topic_selectorautociddurable_descriptor_ear, Client.class, earResURL); + return topic_selectorautociddurable_descriptor_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java new file mode 100644 index 0000000000..1a37a0137d --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java @@ -0,0 +1,156 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.annotated; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.annotated.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.annotated.Client { + /** + EE10 Deployment Descriptors: + topic_selectordupsnondurable_annotated: + topic_selectordupsnondurable_annotated_client: jar.sun-application-client.xml,jar.sun-application-client.xml + topic_selectordupsnondurable_annotated_ejb: jar.sun-ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/topic_selectordupsnondurable_annotated_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/topic_selectordupsnondurable_annotated_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "topic_selectordupsnondurable_annotated", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topic_selectordupsnondurable_annotated_client = ShrinkWrap.create(JavaArchive.class, "topic_selectordupsnondurable_annotated_client.jar"); + // The class files + topic_selectordupsnondurable_annotated_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.annotated.Client.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/topic_selectordupsnondurable_annotated_client.xml"); + if(resURL != null) { + topic_selectordupsnondurable_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/topic_selectordupsnondurable_annotated_client.jar.sun-application-client.xml"); + if(resURL != null) { + topic_selectordupsnondurable_annotated_client.addAsManifestResource(resURL, "application-client.xml"); + } + topic_selectordupsnondurable_annotated_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topic_selectordupsnondurable_annotated_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topic_selectordupsnondurable_annotated_ejb = ShrinkWrap.create(JavaArchive.class, "topic_selectordupsnondurable_annotated_ejb.jar"); + // The class files + topic_selectordupsnondurable_annotated_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.annotated.ActivationConfigBean.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/topic_selectordupsnondurable_annotated_ejb.xml"); + if(ejbResURL != null) { + topic_selectordupsnondurable_annotated_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/topic_selectordupsnondurable_annotated_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topic_selectordupsnondurable_annotated_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topic_selectordupsnondurable_annotated_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive topic_selectordupsnondurable_annotated_ear = ShrinkWrap.create(EnterpriseArchive.class, "topic_selectordupsnondurable_annotated.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topic_selectordupsnondurable_annotated_ear.addAsModule(topic_selectordupsnondurable_annotated_ejb); + topic_selectordupsnondurable_annotated_ear.addAsModule(topic_selectordupsnondurable_annotated_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/application.xml"); + if(earResURL != null) { + topic_selectordupsnondurable_annotated_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/application.ear.sun-application.xml"); + if(earResURL != null) { + topic_selectordupsnondurable_annotated_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topic_selectordupsnondurable_annotated_ear, Client.class, earResURL); + return topic_selectordupsnondurable_annotated_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java new file mode 100644 index 0000000000..9a4baae39b --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java @@ -0,0 +1,157 @@ +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.descriptor; + +import com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("platform") +@Tag("jms_web") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.descriptor.Client { + /** + EE10 Deployment Descriptors: + topic_selectordupsnondurable_descriptor: + topic_selectordupsnondurable_descriptor_client: jar.sun-application-client.xml,jar.sun-application-client.xml + topic_selectordupsnondurable_descriptor_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml,META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_client.jar.sun-application-client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_ejb.xml + /com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_ejb.jar.sun-ejb-jar.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "topic_selectordupsnondurable_descriptor", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive topic_selectordupsnondurable_descriptor_client = ShrinkWrap.create(JavaArchive.class, "topic_selectordupsnondurable_descriptor_client.jar"); + // The class files + topic_selectordupsnondurable_descriptor_client.addClasses( + com.sun.ts.tests.jms.commonee.Client.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.descriptor.Client.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_client.xml"); + if(resURL != null) { + topic_selectordupsnondurable_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_client.jar.sun-application-client.xml"); + if(resURL != null) { + topic_selectordupsnondurable_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); + } + topic_selectordupsnondurable_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(topic_selectordupsnondurable_descriptor_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive topic_selectordupsnondurable_descriptor_ejb = ShrinkWrap.create(JavaArchive.class, "topic_selectordupsnondurable_descriptor_ejb.jar"); + // The class files + topic_selectordupsnondurable_descriptor_ejb.addClasses( + com.sun.ts.tests.jms.ee20.ra.activationconfig.common.ActivationConfigBeanBase.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.StatusReporter.class, + com.sun.ts.tests.jms.common.JmsUtil.class, + com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.descriptor.ActivationConfigBean.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.TLogger.class, + com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_ejb.xml"); + if(ejbResURL != null) { + topic_selectordupsnondurable_descriptor_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/topic_selectordupsnondurable_descriptor_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + topic_selectordupsnondurable_descriptor_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(topic_selectordupsnondurable_descriptor_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive topic_selectordupsnondurable_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "topic_selectordupsnondurable_descriptor.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + topic_selectordupsnondurable_descriptor_ear.addAsModule(topic_selectordupsnondurable_descriptor_ejb); + topic_selectordupsnondurable_descriptor_ear.addAsModule(topic_selectordupsnondurable_descriptor_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/application.xml"); + if(earResURL != null) { + topic_selectordupsnondurable_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/application.ear.sun-application.xml"); + if(earResURL != null) { + topic_selectordupsnondurable_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(topic_selectordupsnondurable_descriptor_ear, Client.class, earResURL); + return topic_selectordupsnondurable_descriptor_ear; + } + + @Test + @Override + public void test1() throws java.lang.Exception { + super.test1(); + } + + @Test + @Override + public void negativeTest1() throws java.lang.Exception { + super.negativeTest1(); + } + + @Test + @Override + public void negativeTest2() throws java.lang.Exception { + super.negativeTest2(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java new file mode 100644 index 0000000000..4e90dde6a4 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java @@ -0,0 +1,219 @@ +package com.sun.ts.tests.jms.ee20.resourcedefs.annotations; + +import com.sun.ts.tests.jms.ee20.resourcedefs.annotations.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("jms_optional") +@Tag("platform_optional") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientTest extends com.sun.ts.tests.jms.ee20.resourcedefs.annotations.Client { + /** + EE10 Deployment Descriptors: + resourcedefs_annotations: META-INF/application.xml + resourcedefs_annotations_client: + resourcedefs_annotations_ejb: + resourcedefs_annotations_web: + + Found Descriptors: + Client: + + Ejb: + + War: + + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = "resourcedefs_annotations", order = 2) + public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive resourcedefs_annotations_web = ShrinkWrap.create(WebArchive.class, "resourcedefs_annotations_web.war"); + // The class files + resourcedefs_annotations_web.addClasses( + com.sun.ts.tests.jms.ee20.resourcedefs.annotations.MyBean.class, + com.sun.ts.tests.jms.ee20.resourcedefs.annotations.ServletClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/resourcedefs/annotations/resourcedefs_annotations_web.xml"); + if(warResURL != null) { + resourcedefs_annotations_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/resourcedefs_annotations_web.war.sun-web.xml"); + if(warResURL != null) { + resourcedefs_annotations_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/JspClient.jsp"); + if(warResURL != null) { + resourcedefs_annotations_web.addAsWebResource(warResURL, "//JspClient.jsp"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/index.html"); + if(warResURL != null) { + resourcedefs_annotations_web.addAsWebResource(warResURL, "//index.html"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(resourcedefs_annotations_web, Client.class, warResURL); + + // Client + // the jar with the correct archive name + JavaArchive resourcedefs_annotations_client = ShrinkWrap.create(JavaArchive.class, "resourcedefs_annotations_client.jar"); + // The class files + resourcedefs_annotations_client.addClasses( + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.resourcedefs.annotations.Client.class, + com.sun.ts.tests.jms.ee20.resourcedefs.annotations.EjbClientIF.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/resourcedefs/annotations/"); + if(resURL != null) { + resourcedefs_annotations_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/.jar.sun-application-client.xml"); + if(resURL != null) { + resourcedefs_annotations_client.addAsManifestResource(resURL, "application-client.xml"); + } + resourcedefs_annotations_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(resourcedefs_annotations_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive resourcedefs_annotations_ejb = ShrinkWrap.create(JavaArchive.class, "resourcedefs_annotations_ejb.jar"); + // The class files + resourcedefs_annotations_ejb.addClasses( + com.sun.ts.tests.jms.ee20.resourcedefs.annotations.EjbClient.class, + com.sun.ts.tests.jms.ee20.resourcedefs.annotations.EjbClientIF.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/resourcedefs_annotations_ejb.xml"); + if(ejbResURL != null) { + resourcedefs_annotations_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/resourcedefs_annotations_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + resourcedefs_annotations_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(resourcedefs_annotations_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive resourcedefs_annotations_ear = ShrinkWrap.create(EnterpriseArchive.class, "resourcedefs_annotations.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + resourcedefs_annotations_ear.addAsModule(resourcedefs_annotations_ejb); + resourcedefs_annotations_ear.addAsModule(resourcedefs_annotations_client); + resourcedefs_annotations_ear.addAsModule(resourcedefs_annotations_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/./application.xml"); + if(earResURL != null) { + resourcedefs_annotations_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/./application.ear.sun-application.xml"); + if(earResURL != null) { + resourcedefs_annotations_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(resourcedefs_annotations_ear, Client.class, earResURL); + return resourcedefs_annotations_ear; + } + + @Test + @Override + public void sendAndRecvQueueTestFromAppClient() throws java.lang.Exception { + super.sendAndRecvQueueTestFromAppClient(); + } + + @Test + @Override + public void sendAndRecvTopicTestFromAppClient() throws java.lang.Exception { + super.sendAndRecvTopicTestFromAppClient(); + } + + @Test + @Override + public void sendAndRecvQueueTestFromServletClient() throws java.lang.Exception { + super.sendAndRecvQueueTestFromServletClient(); + } + + @Test + @Override + public void sendAndRecvTopicTestFromServletClient() throws java.lang.Exception { + super.sendAndRecvTopicTestFromServletClient(); + } + + @Test + @Override + public void sendAndRecvQueueTestFromJspClient() throws java.lang.Exception { + super.sendAndRecvQueueTestFromJspClient(); + } + + @Test + @Override + public void sendAndRecvTopicTestFromJspClient() throws java.lang.Exception { + super.sendAndRecvTopicTestFromJspClient(); + } + + @Test + @Override + public void sendAndRecvQueueTestFromEjbClient() throws java.lang.Exception { + super.sendAndRecvQueueTestFromEjbClient(); + } + + @Test + @Override + public void sendAndRecvTopicTestFromEjbClient() throws java.lang.Exception { + super.sendAndRecvTopicTestFromEjbClient(); + } + + @Test + @Override + public void checkClientIDOnDurableConnFactoryTest() throws java.lang.Exception { + super.checkClientIDOnDurableConnFactoryTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java new file mode 100644 index 0000000000..e96a17ab01 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java @@ -0,0 +1,139 @@ +package com.sun.ts.tests.jms.ee20.resourcedefs.descriptor; + +import com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("jms_optional") +@Tag("platform_optional") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientAppclientTest extends com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client { + static final String VEHICLE_ARCHIVE = "resourcedefs_descriptor_appclient_vehicle"; + + /** + EE10 Deployment Descriptors: + resourcedefs_descriptor_appclient_vehicle: + resourcedefs_descriptor_appclient_vehicle_client: META-INF/application-client.xml + resourcedefs_descriptor_ejb_vehicle: + resourcedefs_descriptor_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + resourcedefs_descriptor_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + resourcedefs_descriptor_jsp_vehicle: + resourcedefs_descriptor_jsp_vehicle_web: WEB-INF/web.xml + resourcedefs_descriptor_servlet_vehicle: + resourcedefs_descriptor_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/appclient_vehicle_client.xml + /com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive resourcedefs_descriptor_appclient_vehicle_client = ShrinkWrap.create(JavaArchive.class, "resourcedefs_descriptor_appclient_vehicle_client.jar"); + // The class files + resourcedefs_descriptor_appclient_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); + if(resURL != null) { + resourcedefs_descriptor_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + resourcedefs_descriptor_appclient_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + resourcedefs_descriptor_appclient_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(resourcedefs_descriptor_appclient_vehicle_client, Client.class, resURL); + + // Ear + EnterpriseArchive resourcedefs_descriptor_appclient_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "resourcedefs_descriptor_appclient_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + resourcedefs_descriptor_appclient_vehicle_ear.addAsModule(resourcedefs_descriptor_appclient_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); + if(earResURL != null) { + resourcedefs_descriptor_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + if(earResURL != null) { + resourcedefs_descriptor_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(resourcedefs_descriptor_appclient_vehicle_ear, Client.class, earResURL); + return resourcedefs_descriptor_appclient_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvQueueTest() throws java.lang.Exception { + super.sendAndRecvQueueTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void sendAndRecvTopicTest() throws java.lang.Exception { + super.sendAndRecvTopicTest(); + } + + @Test + @Override + @TargetVehicle("appclient") + public void checkClientIDOnDurableConnFactoryTest() throws java.lang.Exception { + super.checkClientIDOnDurableConnFactoryTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java new file mode 100644 index 0000000000..fd43b4951a --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java @@ -0,0 +1,175 @@ +package com.sun.ts.tests.jms.ee20.resourcedefs.descriptor; + +import com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("jms_optional") +@Tag("platform_optional") +@Tag("web_optional") +@Tag("tck-appclient") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientEjbTest extends com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client { + static final String VEHICLE_ARCHIVE = "resourcedefs_descriptor_ejb_vehicle"; + + /** + EE10 Deployment Descriptors: + resourcedefs_descriptor_appclient_vehicle: + resourcedefs_descriptor_appclient_vehicle_client: META-INF/application-client.xml + resourcedefs_descriptor_ejb_vehicle: + resourcedefs_descriptor_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + resourcedefs_descriptor_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + resourcedefs_descriptor_jsp_vehicle: + resourcedefs_descriptor_jsp_vehicle_web: WEB-INF/web.xml + resourcedefs_descriptor_servlet_vehicle: + resourcedefs_descriptor_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + Client: + + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml + Ejb: + + /com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ejb_vehicle_ejb.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml + /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml + Ear: + + */ + @TargetsContainer("tck-appclient") + @OverProtocol("appclient") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // Client + // the jar with the correct archive name + JavaArchive resourcedefs_descriptor_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "resourcedefs_descriptor_ejb_vehicle_client.jar"); + // The class files + resourcedefs_descriptor_ejb_vehicle_client.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The application-client.xml descriptor + URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml"); + if(resURL != null) { + resourcedefs_descriptor_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? + resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml"); + if(resURL != null) { + resourcedefs_descriptor_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + } + resourcedefs_descriptor_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); + // Call the archive processor + archiveProcessor.processClientArchive(resourcedefs_descriptor_ejb_vehicle_client, Client.class, resURL); + + // Ejb + // the jar with the correct archive name + JavaArchive resourcedefs_descriptor_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "resourcedefs_descriptor_ejb_vehicle_ejb.jar"); + // The class files + resourcedefs_descriptor_ejb_vehicle_ejb.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class + ); + // The ejb-jar.xml descriptor + URL ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml"); + if(ejbResURL != null) { + resourcedefs_descriptor_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + } + // The sun-ejb-jar.xml file + ejbResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL != null) { + resourcedefs_descriptor_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + } + // Call the archive processor + archiveProcessor.processEjbArchive(resourcedefs_descriptor_ejb_vehicle_ejb, Client.class, ejbResURL); + + // Ear + EnterpriseArchive resourcedefs_descriptor_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "resourcedefs_descriptor_ejb_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + resourcedefs_descriptor_ejb_vehicle_ear.addAsModule(resourcedefs_descriptor_ejb_vehicle_ejb); + resourcedefs_descriptor_ejb_vehicle_ear.addAsModule(resourcedefs_descriptor_ejb_vehicle_client); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); + if(earResURL != null) { + resourcedefs_descriptor_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + if(earResURL != null) { + resourcedefs_descriptor_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(resourcedefs_descriptor_ejb_vehicle_ear, Client.class, earResURL); + return resourcedefs_descriptor_ejb_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvQueueTest() throws java.lang.Exception { + super.sendAndRecvQueueTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void sendAndRecvTopicTest() throws java.lang.Exception { + super.sendAndRecvTopicTest(); + } + + @Test + @Override + @TargetVehicle("ejb") + public void checkClientIDOnDurableConnFactoryTest() throws java.lang.Exception { + super.checkClientIDOnDurableConnFactoryTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java new file mode 100644 index 0000000000..8eedc2bdf1 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java @@ -0,0 +1,158 @@ +package com.sun.ts.tests.jms.ee20.resourcedefs.descriptor; + +import com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("jms_optional") +@Tag("platform_optional") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientJspTest extends com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client { + static final String VEHICLE_ARCHIVE = "resourcedefs_descriptor_jsp_vehicle"; + + /** + EE10 Deployment Descriptors: + resourcedefs_descriptor_appclient_vehicle: + resourcedefs_descriptor_appclient_vehicle_client: META-INF/application-client.xml + resourcedefs_descriptor_ejb_vehicle: + resourcedefs_descriptor_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + resourcedefs_descriptor_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + resourcedefs_descriptor_jsp_vehicle: + resourcedefs_descriptor_jsp_vehicle_web: WEB-INF/web.xml + resourcedefs_descriptor_servlet_vehicle: + resourcedefs_descriptor_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/jsp_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive resourcedefs_descriptor_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "resourcedefs_descriptor_jsp_vehicle_web.war"); + // The class files + resourcedefs_descriptor_jsp_vehicle_web.addClasses( + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/jsp_vehicle_web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); + if(warResURL != null) { + resourcedefs_descriptor_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); + if(warResURL != null) { + resourcedefs_descriptor_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(resourcedefs_descriptor_jsp_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive resourcedefs_descriptor_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "resourcedefs_descriptor_jsp_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + resourcedefs_descriptor_jsp_vehicle_ear.addAsModule(resourcedefs_descriptor_jsp_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); + if(earResURL != null) { + resourcedefs_descriptor_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + if(earResURL != null) { + resourcedefs_descriptor_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(resourcedefs_descriptor_jsp_vehicle_ear, Client.class, earResURL); + return resourcedefs_descriptor_jsp_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvQueueTest() throws java.lang.Exception { + super.sendAndRecvQueueTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void sendAndRecvTopicTest() throws java.lang.Exception { + super.sendAndRecvTopicTest(); + } + + @Test + @Override + @TargetVehicle("jsp") + public void checkClientIDOnDurableConnFactoryTest() throws java.lang.Exception { + super.checkClientIDOnDurableConnFactoryTest(); + } + + +} \ No newline at end of file diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java new file mode 100644 index 0000000000..0cf148dff6 --- /dev/null +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java @@ -0,0 +1,151 @@ +package com.sun.ts.tests.jms.ee20.resourcedefs.descriptor; + +import com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client; +import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import tck.arquillian.porting.lib.spi.TestArchiveProcessor; +import tck.arquillian.protocol.common.TargetVehicle; + + + +@ExtendWith(ArquillianExtension.class) +@Tag("jms") +@Tag("jms_optional") +@Tag("platform_optional") +@Tag("web_optional") +@Tag("tck-javatest") + +@TestMethodOrder(MethodOrderer.MethodName.class) +public class ClientServletTest extends com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client { + static final String VEHICLE_ARCHIVE = "resourcedefs_descriptor_servlet_vehicle"; + + /** + EE10 Deployment Descriptors: + resourcedefs_descriptor_appclient_vehicle: + resourcedefs_descriptor_appclient_vehicle_client: META-INF/application-client.xml + resourcedefs_descriptor_ejb_vehicle: + resourcedefs_descriptor_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml + resourcedefs_descriptor_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml + resourcedefs_descriptor_jsp_vehicle: + resourcedefs_descriptor_jsp_vehicle_web: WEB-INF/web.xml + resourcedefs_descriptor_servlet_vehicle: + resourcedefs_descriptor_servlet_vehicle_web: WEB-INF/web.xml + + Found Descriptors: + War: + + /com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/servlet_vehicle_web.xml + /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml + Ear: + + */ + @TargetsContainer("tck-javatest") + @OverProtocol("javatest") + @Deployment(name = VEHICLE_ARCHIVE, order = 2) + public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + // War + // the war with the correct archive name + WebArchive resourcedefs_descriptor_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "resourcedefs_descriptor_servlet_vehicle_web.war"); + // The class files + resourcedefs_descriptor_servlet_vehicle_web.addClasses( + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jms.common.JmsTool.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class + ); + // The web.xml descriptor + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); + } + // The sun-web.xml descriptor + warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + + // Any libraries added to the war + + // Web content + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + warResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/servlet_vehicle_web.xml"); + if(warResURL != null) { + resourcedefs_descriptor_servlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/servlet_vehicle_web.xml"); + } + + // Call the archive processor + archiveProcessor.processWebArchive(resourcedefs_descriptor_servlet_vehicle_web, Client.class, warResURL); + + // Ear + EnterpriseArchive resourcedefs_descriptor_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "resourcedefs_descriptor_servlet_vehicle.ear"); + + // Any libraries added to the ear + + // The component jars built by the package target + resourcedefs_descriptor_servlet_vehicle_ear.addAsModule(resourcedefs_descriptor_servlet_vehicle_web); + + + + // The application.xml descriptor + URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); + if(earResURL != null) { + resourcedefs_descriptor_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); + } + // The sun-application.xml descriptor + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + if(earResURL != null) { + resourcedefs_descriptor_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); + } + // Call the archive processor + archiveProcessor.processEarArchive(resourcedefs_descriptor_servlet_vehicle_ear, Client.class, earResURL); + return resourcedefs_descriptor_servlet_vehicle_ear; + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvQueueTest() throws java.lang.Exception { + super.sendAndRecvQueueTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void sendAndRecvTopicTest() throws java.lang.Exception { + super.sendAndRecvTopicTest(); + } + + @Test + @Override + @TargetVehicle("servlet") + public void checkClientIDOnDurableConnFactoryTest() throws java.lang.Exception { + super.checkClientIDOnDurableConnFactoryTest(); + } + + +} \ No newline at end of file From 0b84541865085a0e139b057d27de4b7a41a1d286 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Sat, 24 Aug 2024 21:39:39 -0600 Subject: [PATCH 2/4] Fix the ear missing desciptors Signed-off-by: Scott M Stark --- .../ClosedQueueConnectionTestsAppclientTest.java | 7 ++----- .../ClosedQueueReceiverTestsAppclientTest.java | 7 ++----- .../ClosedQueueSessionTestsAppclientTest.java | 7 ++----- .../ClosedTopicConnectionTestsAppclientTest.java | 7 ++----- .../ClosedTopicSessionTestsAppclientTest.java | 7 ++----- .../invalidDest/InvalidDestTestsAppclientTest.java | 7 ++----- .../appclient/queueconn/QueueConnTestsAppclientTest.java | 7 ++----- .../core/appclient/queuetests/QueueTestsAppclientTest.java | 7 ++----- .../core/appclient/topictests/TopicTestsAppclientTest.java | 7 ++----- .../appclient/txqueuetests/TxQueueTestsAppclientTest.java | 7 ++----- .../appclient/txtopictests/TxTopicTestsAppclientTest.java | 7 ++----- .../bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java | 7 ++----- .../jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java | 7 ++----- .../jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java | 7 ++----- .../core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java | 7 ++----- .../bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java | 7 ++----- .../jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java | 7 ++----- .../jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java | 7 ++----- .../core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java | 7 ++----- .../ClosedQueueConnectionTestsAppclientTest.java | 7 ++----- .../ClosedQueueConnectionTestsEjbTest.java | 7 ++----- .../ClosedQueueConnectionTestsJspTest.java | 7 ++----- .../ClosedQueueConnectionTestsServletTest.java | 7 ++----- .../ClosedQueueReceiverTestsAppclientTest.java | 7 ++----- .../ClosedQueueReceiverTestsEjbTest.java | 7 ++----- .../ClosedQueueReceiverTestsJspTest.java | 7 ++----- .../ClosedQueueReceiverTestsServletTest.java | 7 ++----- .../ClosedQueueSenderTestsAppclientTest.java | 7 ++----- .../closedQueueSender/ClosedQueueSenderTestsEjbTest.java | 7 ++----- .../closedQueueSender/ClosedQueueSenderTestsJspTest.java | 7 ++----- .../ClosedQueueSenderTestsServletTest.java | 7 ++----- .../ClosedQueueSessionTestsAppclientTest.java | 7 ++----- .../closedQueueSession/ClosedQueueSessionTestsEjbTest.java | 7 ++----- .../closedQueueSession/ClosedQueueSessionTestsJspTest.java | 7 ++----- .../ClosedQueueSessionTestsServletTest.java | 7 ++----- .../ClosedTopicConnectionTestsAppclientTest.java | 7 ++----- .../ClosedTopicConnectionTestsEjbTest.java | 7 ++----- .../ClosedTopicConnectionTestsJspTest.java | 7 ++----- .../ClosedTopicConnectionTestsServletTest.java | 7 ++----- .../ClosedTopicPublisherTestsAppclientTest.java | 7 ++----- .../ClosedTopicPublisherTestsEjbTest.java | 7 ++----- .../ClosedTopicPublisherTestsJspTest.java | 7 ++----- .../ClosedTopicPublisherTestsServletTest.java | 7 ++----- .../ClosedTopicSessionTestsAppclientTest.java | 7 ++----- .../closedTopicSession/ClosedTopicSessionTestsEjbTest.java | 7 ++----- .../closedTopicSession/ClosedTopicSessionTestsJspTest.java | 7 ++----- .../ClosedTopicSessionTestsServletTest.java | 7 ++----- .../ClosedTopicSubscriberTestsAppclientTest.java | 7 ++----- .../ClosedTopicSubscriberTestsEjbTest.java | 7 ++----- .../ClosedTopicSubscriberTestsJspTest.java | 7 ++----- .../ClosedTopicSubscriberTestsServletTest.java | 7 ++----- .../exceptionQueue/ExceptionQueueTestsAppclientTest.java | 7 ++----- .../core/exceptionQueue/ExceptionQueueTestsEjbTest.java | 7 ++----- .../core/exceptionQueue/ExceptionQueueTestsJspTest.java | 7 ++----- .../exceptionQueue/ExceptionQueueTestsServletTest.java | 7 ++----- .../exceptionTopic/ExceptionTopicTestsAppclientTest.java | 7 ++----- .../core/exceptionTopic/ExceptionTopicTestsEjbTest.java | 7 ++----- .../core/exceptionTopic/ExceptionTopicTestsJspTest.java | 7 ++----- .../exceptionTopic/ExceptionTopicTestsServletTest.java | 7 ++----- .../foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java | 7 ++----- .../core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java | 7 ++----- .../core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java | 7 ++----- .../foreignMsgQueue/ForeignMsgQueueTestsServletTest.java | 7 ++----- .../foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java | 7 ++----- .../core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java | 7 ++----- .../core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java | 7 ++----- .../foreignMsgTopic/ForeignMsgTopicTestsServletTest.java | 7 ++----- .../core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java | 7 ++----- .../jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java | 7 ++----- .../jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java | 7 ++----- .../jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java | 7 ++----- .../core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java | 7 ++----- .../jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java | 7 ++----- .../jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java | 7 ++----- .../jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java | 7 ++----- .../messageProducer/MessageProducerTestsAppclientTest.java | 7 ++----- .../core/messageProducer/MessageProducerTestsEjbTest.java | 7 ++----- .../core/messageProducer/MessageProducerTestsJspTest.java | 7 ++----- .../messageProducer/MessageProducerTestsServletTest.java | 7 ++----- .../objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java | 7 ++----- .../core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java | 7 ++----- .../core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java | 7 ++----- .../objectMsgQueue/ObjectMsgQueueTestsServletTest.java | 7 ++----- .../queueConnection/QueueConnectionTestsAppclientTest.java | 7 ++----- .../core/queueConnection/QueueConnectionTestsEjbTest.java | 7 ++----- .../core/queueConnection/QueueConnectionTestsJspTest.java | 7 ++----- .../queueConnection/QueueConnectionTestsServletTest.java | 7 ++----- .../queueMsgHeaders/QueueHeaderTestsAppclientTest.java | 7 ++----- .../jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java | 7 ++----- .../jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java | 7 ++----- .../core/queueMsgHeaders/QueueHeaderTestsServletTest.java | 7 ++----- .../QueuePropertyTestsAppclientTest.java | 7 ++----- .../core/queueMsgProperties/QueuePropertyTestsEjbTest.java | 7 ++----- .../core/queueMsgProperties/QueuePropertyTestsJspTest.java | 7 ++----- .../queueMsgProperties/QueuePropertyTestsServletTest.java | 7 ++----- .../tests/jms/core/queuetests/QueueTestsAppclientTest.java | 7 ++----- .../ts/tests/jms/core/queuetests/QueueTestsEjbTest.java | 7 ++----- .../ts/tests/jms/core/queuetests/QueueTestsJspTest.java | 7 ++----- .../tests/jms/core/queuetests/QueueTestsServletTest.java | 7 ++----- .../selectorQueue/MsgSelectorQueueTestsAppclientTest.java | 7 ++----- .../core/selectorQueue/MsgSelectorQueueTestsEjbTest.java | 7 ++----- .../core/selectorQueue/MsgSelectorQueueTestsJspTest.java | 7 ++----- .../selectorQueue/MsgSelectorQueueTestsServletTest.java | 7 ++----- .../selectorTopic/MsgSelectorTopicTestsAppclientTest.java | 7 ++----- .../core/selectorTopic/MsgSelectorTopicTestsEjbTest.java | 7 ++----- .../core/selectorTopic/MsgSelectorTopicTestsJspTest.java | 7 ++----- .../selectorTopic/MsgSelectorTopicTestsServletTest.java | 7 ++----- .../jms/core/sessiontests/SessionTestsAppclientTest.java | 7 ++----- .../tests/jms/core/sessiontests/SessionTestsEjbTest.java | 7 ++----- .../tests/jms/core/sessiontests/SessionTestsJspTest.java | 7 ++----- .../jms/core/sessiontests/SessionTestsServletTest.java | 7 ++----- .../streamMsgQueue/StreamMsgQueueTestsAppclientTest.java | 7 ++----- .../core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java | 7 ++----- .../core/streamMsgQueue/StreamMsgQueueTestsJspTest.java | 7 ++----- .../streamMsgQueue/StreamMsgQueueTestsServletTest.java | 7 ++----- .../streamMsgTopic/StreamMsgTopicTestsAppclientTest.java | 7 ++----- .../core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java | 7 ++----- .../core/streamMsgTopic/StreamMsgTopicTestsJspTest.java | 7 ++----- .../streamMsgTopic/StreamMsgTopicTestsServletTest.java | 7 ++----- .../topicConnection/TopicConnectionTestsAppclientTest.java | 7 ++----- .../core/topicConnection/TopicConnectionTestsEjbTest.java | 7 ++----- .../core/topicConnection/TopicConnectionTestsJspTest.java | 7 ++----- .../topicConnection/TopicConnectionTestsServletTest.java | 7 ++----- .../topicMsgHeaders/TopicHeaderTestsAppclientTest.java | 7 ++----- .../jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java | 7 ++----- .../jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java | 7 ++----- .../core/topicMsgHeaders/TopicHeaderTestsServletTest.java | 7 ++----- .../TopicPropertyTestsAppclientTest.java | 7 ++----- .../core/topicMsgProperties/TopicPropertyTestsEjbTest.java | 7 ++----- .../core/topicMsgProperties/TopicPropertyTestsJspTest.java | 7 ++----- .../topicMsgProperties/TopicPropertyTestsServletTest.java | 7 ++----- .../tests/jms/core/topictests/TopicTestsAppclientTest.java | 7 ++----- .../ts/tests/jms/core/topictests/TopicTestsEjbTest.java | 7 ++----- .../ts/tests/jms/core/topictests/TopicTestsJspTest.java | 7 ++----- .../tests/jms/core/topictests/TopicTestsServletTest.java | 7 ++----- .../appclient/jmsconsumertests/ClientAppclientTest.java | 7 ++----- .../jmscontextqueuetests/ClientAppclientTest.java | 7 ++----- .../jmscontexttopictests/ClientAppclientTest.java | 7 ++----- .../listenerexceptiontests/ClientAppclientTest.java | 7 ++----- .../messageconsumertests/ClientAppclientTest.java | 7 ++----- .../messageproducertests/ClientAppclientTest.java | 7 ++----- .../core20/connectionfactorytests/ClientAppclientTest.java | 7 ++----- .../jms/core20/connectionfactorytests/ClientEjbTest.java | 7 ++----- .../jms/core20/connectionfactorytests/ClientJspTest.java | 7 ++----- .../core20/connectionfactorytests/ClientServletTest.java | 7 ++----- .../jms/core20/jmsconsumertests/ClientAppclientTest.java | 7 ++----- .../tests/jms/core20/jmsconsumertests/ClientEjbTest.java | 7 ++----- .../tests/jms/core20/jmsconsumertests/ClientJspTest.java | 7 ++----- .../jms/core20/jmsconsumertests/ClientServletTest.java | 7 ++----- .../core20/jmscontextqueuetests/ClientAppclientTest.java | 7 ++----- .../jms/core20/jmscontextqueuetests/ClientEjbTest.java | 7 ++----- .../jms/core20/jmscontextqueuetests/ClientJspTest.java | 7 ++----- .../jms/core20/jmscontextqueuetests/ClientServletTest.java | 7 ++----- .../core20/jmscontexttopictests/ClientAppclientTest.java | 7 ++----- .../jms/core20/jmscontexttopictests/ClientEjbTest.java | 7 ++----- .../jms/core20/jmscontexttopictests/ClientJspTest.java | 7 ++----- .../jms/core20/jmscontexttopictests/ClientServletTest.java | 7 ++----- .../core20/jmsproducerqueuetests/ClientAppclientTest.java | 7 ++----- .../jms/core20/jmsproducerqueuetests/ClientEjbTest.java | 7 ++----- .../jms/core20/jmsproducerqueuetests/ClientJspTest.java | 7 ++----- .../core20/jmsproducerqueuetests/ClientServletTest.java | 7 ++----- .../core20/jmsproducertopictests/ClientAppclientTest.java | 7 ++----- .../jms/core20/jmsproducertopictests/ClientEjbTest.java | 7 ++----- .../jms/core20/jmsproducertopictests/ClientJspTest.java | 7 ++----- .../core20/jmsproducertopictests/ClientServletTest.java | 7 ++----- .../core20/messageproducertests/ClientAppclientTest.java | 7 ++----- .../jms/core20/messageproducertests/ClientEjbTest.java | 7 ++----- .../jms/core20/messageproducertests/ClientJspTest.java | 7 ++----- .../jms/core20/messageproducertests/ClientServletTest.java | 7 ++----- .../core20/runtimeexceptiontests/ClientAppclientTest.java | 7 ++----- .../jms/core20/runtimeexceptiontests/ClientEjbTest.java | 7 ++----- .../jms/core20/runtimeexceptiontests/ClientJspTest.java | 7 ++----- .../core20/runtimeexceptiontests/ClientServletTest.java | 7 ++----- .../tests/jms/core20/sessiontests/ClientAppclientTest.java | 7 ++----- .../ts/tests/jms/core20/sessiontests/ClientEjbTest.java | 7 ++----- .../ts/tests/jms/core20/sessiontests/ClientJspTest.java | 7 ++----- .../tests/jms/core20/sessiontests/ClientServletTest.java | 7 ++----- .../sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java | 7 ++----- .../ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java | 7 ++----- .../ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java | 7 ++----- .../jms/ee/ejbweb/xa/TransactionTestsServletTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java | 7 ++----- .../com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java | 7 ++----- .../com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java | 7 ++----- .../java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java | 7 ++----- .../sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java | 7 ++++--- .../com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java | 7 ++++--- .../ts/tests/jms/ee20/cditests/usecases/ClientTest.java | 7 ++++--- .../queue/selectorauto/annotated/ClientTest.java | 3 ++- .../queue/selectorauto/descriptor/ClientTest.java | 3 ++- .../queue/selectordups/annotated/ClientTest.java | 3 ++- .../queue/selectordups/descriptor/ClientTest.java | 3 ++- .../topic/noselnocidautodurable/annotated/ClientTest.java | 3 ++- .../topic/noselnocidautodurable/descriptor/ClientTest.java | 3 ++- .../topic/selectorautociddurable/annotated/ClientTest.java | 3 ++- .../selectorautociddurable/descriptor/ClientTest.java | 3 ++- .../topic/selectordupsnondurable/annotated/ClientTest.java | 3 ++- .../selectordupsnondurable/descriptor/ClientTest.java | 3 ++- .../jms/ee20/resourcedefs/annotations/ClientTest.java | 7 ++++--- .../ee20/resourcedefs/descriptor/ClientAppclientTest.java | 7 ++----- .../jms/ee20/resourcedefs/descriptor/ClientEjbTest.java | 7 ++----- .../jms/ee20/resourcedefs/descriptor/ClientJspTest.java | 7 ++----- .../ee20/resourcedefs/descriptor/ClientServletTest.java | 7 ++----- 219 files changed, 446 insertions(+), 1047 deletions(-) diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java index cd05a5f29c..1d4e1cf9c9 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java @@ -107,12 +107,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/"); - if(earResURL != null) { - closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/.ear.sun-application.xml"); + earResURL = ClosedQueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java index f7eb7d7a25..1ee1b8b962 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java @@ -103,12 +103,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/"); - if(earResURL != null) { - closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/.ear.sun-application.xml"); + earResURL = ClosedQueueReceiverTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java index 3cca3aca4a..735410cee7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueSession/"); - if(earResURL != null) { - closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedQueueSession/.ear.sun-application.xml"); + earResURL = ClosedQueueSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java index 32c67637a5..e5e7065659 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java @@ -107,12 +107,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/"); - if(earResURL != null) { - closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/.ear.sun-application.xml"); + earResURL = ClosedTopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java index c078c3fe3e..84fd1be1af 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java @@ -105,12 +105,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicSession/"); - if(earResURL != null) { - closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/closedTopicSession/.ear.sun-application.xml"); + earResURL = ClosedTopicSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java index 256110efe7..ec5f4608b3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsAppclientTest.java @@ -93,12 +93,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = InvalidDestTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/invalidDest/"); - if(earResURL != null) { - invalidDest_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = InvalidDestTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/invalidDest/.ear.sun-application.xml"); + earResURL = InvalidDestTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { invalidDest_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java index 743fe95a05..eebcca3c12 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsAppclientTest.java @@ -93,12 +93,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueConnTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queueconn/"); - if(earResURL != null) { - queueconn_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueConnTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queueconn/.ear.sun-application.xml"); + earResURL = QueueConnTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueconn_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java index 89121a3d39..0bc1e6baf6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queuetests/"); - if(earResURL != null) { - queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/queuetests/.ear.sun-application.xml"); + earResURL = QueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java index 9fb2790945..6e67aa6c6d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/topictests/"); - if(earResURL != null) { - topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/topictests/.ear.sun-application.xml"); + earResURL = TopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java index 9cf7b10593..551d650aea 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsAppclientTest.java @@ -93,12 +93,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TxQueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txqueuetests/"); - if(earResURL != null) { - txqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TxQueueTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txqueuetests/.ear.sun-application.xml"); + earResURL = TxQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { txqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java index e28c0c0a1a..a63dc491b2 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsAppclientTest.java @@ -93,12 +93,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TxTopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txtopictests/"); - if(earResURL != null) { - txTopicTests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TxTopicTests.class.getResource("/com/sun/ts/tests/jms/core/appclient/txtopictests/.ear.sun-application.xml"); + earResURL = TxTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { txTopicTests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java index b32d9d8c76..30cbf82246 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); - if(earResURL != null) { - bytesMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + earResURL = BytesMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java index 651c8b930f..5fdca946b4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); - if(earResURL != null) { - bytesMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + earResURL = BytesMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java index 1d3b021bdd..70095f3b0c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); - if(earResURL != null) { - bytesMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + earResURL = BytesMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java index 1c366e0ec5..c5641ec42d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/"); - if(earResURL != null) { - bytesMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgQueue/.ear.sun-application.xml"); + earResURL = BytesMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java index f95d4a719c..09844f3937 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); - if(earResURL != null) { - bytesMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + earResURL = BytesMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java index b1e304d9d5..b221676d68 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); - if(earResURL != null) { - bytesMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + earResURL = BytesMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java index 02635ced2d..3e2de229d1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); - if(earResURL != null) { - bytesMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + earResURL = BytesMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java index ddf9812f9e..5da6afff1b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/"); - if(earResURL != null) { - bytesMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = BytesMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/bytesMsgTopic/.ear.sun-application.xml"); + earResURL = BytesMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { bytesMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java index f96c875399..914d14f988 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); - if(earResURL != null) { - closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + earResURL = ClosedQueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java index 60100250b5..9281124f8d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsEjbTest.java @@ -139,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); - if(earResURL != null) { - closedQueueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + earResURL = ClosedQueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java index b88ad2aed0..e86398decd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsJspTest.java @@ -121,12 +121,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); - if(earResURL != null) { - closedQueueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + earResURL = ClosedQueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java index ad7f87e270..82756b48d5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsServletTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/"); - if(earResURL != null) { - closedQueueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueConnection/.ear.sun-application.xml"); + earResURL = ClosedQueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java index 8763aa3abb..75b9c594f7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); - if(earResURL != null) { - closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + earResURL = ClosedQueueReceiverTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueReceiver_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java index 384e495c08..e5edffdf86 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); - if(earResURL != null) { - closedQueueReceiver_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + earResURL = ClosedQueueReceiverTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueReceiver_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java index a433397dd7..a398ff4324 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); - if(earResURL != null) { - closedQueueReceiver_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + earResURL = ClosedQueueReceiverTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueReceiver_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java index db0dda1732..5137cbff0c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/"); - if(earResURL != null) { - closedQueueReceiver_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueReceiver/.ear.sun-application.xml"); + earResURL = ClosedQueueReceiverTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueReceiver_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java index f50322c4d8..a6b8f30c80 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); - if(earResURL != null) { - closedQueueSender_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + earResURL = ClosedQueueSenderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSender_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java index 15574718f0..7a6d1fc0a1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsEjbTest.java @@ -139,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); - if(earResURL != null) { - closedQueueSender_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + earResURL = ClosedQueueSenderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSender_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java index 64c9115313..b0ba4d56df 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsJspTest.java @@ -121,12 +121,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); - if(earResURL != null) { - closedQueueSender_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + earResURL = ClosedQueueSenderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSender_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java index 30ebccb00b..00248bd909 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsServletTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/"); - if(earResURL != null) { - closedQueueSender_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSenderTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSender/.ear.sun-application.xml"); + earResURL = ClosedQueueSenderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSender_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java index bb658beb0b..2b24a8ab2a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java @@ -106,12 +106,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); - if(earResURL != null) { - closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + earResURL = ClosedQueueSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java index 1ca1c98a40..0fd70276b1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsEjbTest.java @@ -154,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); - if(earResURL != null) { - closedQueueSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + earResURL = ClosedQueueSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java index 350e6d3c10..920477643c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsJspTest.java @@ -131,12 +131,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); - if(earResURL != null) { - closedQueueSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + earResURL = ClosedQueueSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java index fb80c36cd0..21abe37c5b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsServletTest.java @@ -124,12 +124,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/"); - if(earResURL != null) { - closedQueueSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedQueueSession/.ear.sun-application.xml"); + earResURL = ClosedQueueSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedQueueSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java index 29ac35b52a..261f635bbf 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); - if(earResURL != null) { - closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + earResURL = ClosedTopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java index c35b72ef07..e7d251137d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsEjbTest.java @@ -139,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); - if(earResURL != null) { - closedTopicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + earResURL = ClosedTopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java index 32eeac348e..e46481d121 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsJspTest.java @@ -121,12 +121,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); - if(earResURL != null) { - closedTopicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + earResURL = ClosedTopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java index 1a764da539..065e897006 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsServletTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/"); - if(earResURL != null) { - closedTopicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicConnection/.ear.sun-application.xml"); + earResURL = ClosedTopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java index fbaa66e6d9..db405a9eff 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); - if(earResURL != null) { - closedTopicPublisher_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + earResURL = ClosedTopicPublisherTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicPublisher_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java index ed362d1087..b84cdd8f8d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsEjbTest.java @@ -139,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); - if(earResURL != null) { - closedTopicPublisher_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + earResURL = ClosedTopicPublisherTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicPublisher_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java index c987290f07..e8dc0fb6ea 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsJspTest.java @@ -121,12 +121,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); - if(earResURL != null) { - closedTopicPublisher_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + earResURL = ClosedTopicPublisherTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicPublisher_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java index fa038f33df..e75dac34dd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsServletTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/"); - if(earResURL != null) { - closedTopicPublisher_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicPublisherTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicPublisher/.ear.sun-application.xml"); + earResURL = ClosedTopicPublisherTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicPublisher_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java index c70707cd56..8e6d6c7443 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); - if(earResURL != null) { - closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + earResURL = ClosedTopicSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSession_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java index bba70f6acb..382548516d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsEjbTest.java @@ -139,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); - if(earResURL != null) { - closedTopicSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + earResURL = ClosedTopicSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSession_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java index e9b5e4922c..7d48b39e03 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsJspTest.java @@ -121,12 +121,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); - if(earResURL != null) { - closedTopicSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + earResURL = ClosedTopicSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSession_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java index 77b3ad1439..08a24dce43 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsServletTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/"); - if(earResURL != null) { - closedTopicSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSession/.ear.sun-application.xml"); + earResURL = ClosedTopicSessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSession_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java index 5d7791d1fe..5a808451f3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); - if(earResURL != null) { - closedTopicSubscriber_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + earResURL = ClosedTopicSubscriberTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSubscriber_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java index bc8925da9a..44f7bc32ee 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); - if(earResURL != null) { - closedTopicSubscriber_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + earResURL = ClosedTopicSubscriberTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSubscriber_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java index 7486936d5f..68969129a3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); - if(earResURL != null) { - closedTopicSubscriber_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + earResURL = ClosedTopicSubscriberTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSubscriber_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java index 0872b3541a..40c2b8f7dc 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/"); - if(earResURL != null) { - closedTopicSubscriber_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ClosedTopicSubscriberTests.class.getResource("/com/sun/ts/tests/jms/core/closedTopicSubscriber/.ear.sun-application.xml"); + earResURL = ClosedTopicSubscriberTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { closedTopicSubscriber_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java index 4e44f401d6..7d236a90de 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); - if(earResURL != null) { - exceptionQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + earResURL = ExceptionQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java index ebeb2c3b81..c34e6cc4c9 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); - if(earResURL != null) { - exceptionQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + earResURL = ExceptionQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java index e3e97c1098..94b025a686 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); - if(earResURL != null) { - exceptionQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + earResURL = ExceptionQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java index df835c514d..5921c45101 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/"); - if(earResURL != null) { - exceptionQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionQueueTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionQueue/.ear.sun-application.xml"); + earResURL = ExceptionQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java index c468ec3398..d087b7f3c2 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); - if(earResURL != null) { - exceptionTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + earResURL = ExceptionTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java index 31f56d61e9..969cc9953e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); - if(earResURL != null) { - exceptionTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + earResURL = ExceptionTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java index e9b9dca1fe..21a7d21913 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); - if(earResURL != null) { - exceptionTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + earResURL = ExceptionTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java index 00c62b4f45..5c7aa68867 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/"); - if(earResURL != null) { - exceptionTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ExceptionTopicTests.class.getResource("/com/sun/ts/tests/jms/core/exceptionTopic/.ear.sun-application.xml"); + earResURL = ExceptionTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { exceptionTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java index cb93f39767..7c9ab6bef5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsAppclientTest.java @@ -106,12 +106,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); - if(earResURL != null) { - foreignMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + earResURL = ForeignMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java index 1af220b5c1..efb09dfa3f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsEjbTest.java @@ -156,12 +156,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); - if(earResURL != null) { - foreignMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + earResURL = ForeignMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java index 193e136057..4a5c4bc954 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsJspTest.java @@ -132,12 +132,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); - if(earResURL != null) { - foreignMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + earResURL = ForeignMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java index feb544bf54..3dfc7a1f59 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsServletTest.java @@ -125,12 +125,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/"); - if(earResURL != null) { - foreignMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgQueue/.ear.sun-application.xml"); + earResURL = ForeignMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java index a3a4d72c85..6b5d096c09 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsAppclientTest.java @@ -106,12 +106,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); - if(earResURL != null) { - foreignMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + earResURL = ForeignMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java index 659d05b228..49a7844055 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsEjbTest.java @@ -154,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); - if(earResURL != null) { - foreignMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + earResURL = ForeignMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java index 714a0268eb..538efc9bf7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsJspTest.java @@ -131,12 +131,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); - if(earResURL != null) { - foreignMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + earResURL = ForeignMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java index f96758427a..efc58bce95 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsServletTest.java @@ -124,12 +124,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/"); - if(earResURL != null) { - foreignMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ForeignMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/foreignMsgTopic/.ear.sun-application.xml"); + earResURL = ForeignMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { foreignMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java index eaa0f0dce6..ef59be56c8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); - if(earResURL != null) { - mapMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + earResURL = MapMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java index dd6b17dd84..43193e8136 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsEjbTest.java @@ -138,12 +138,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); - if(earResURL != null) { - mapMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + earResURL = MapMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java index 02096176da..6dc21ed1c1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsJspTest.java @@ -120,12 +120,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); - if(earResURL != null) { - mapMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + earResURL = MapMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java index 518e2e0c70..89967c2984 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsServletTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/"); - if(earResURL != null) { - mapMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgQueue/.ear.sun-application.xml"); + earResURL = MapMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java index f749b997a2..30a9828bcf 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); - if(earResURL != null) { - mapMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + earResURL = MapMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java index 55d504b2ff..85358c6919 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); - if(earResURL != null) { - mapMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + earResURL = MapMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java index 328c746b71..cf8fd4bb11 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); - if(earResURL != null) { - mapMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + earResURL = MapMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java index b1a76a5802..4ffdcb6774 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/"); - if(earResURL != null) { - mapMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MapMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/mapMsgTopic/.ear.sun-application.xml"); + earResURL = MapMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mapMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java index 806b4b81dd..25198b3371 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); - if(earResURL != null) { - messageProducer_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + earResURL = MessageProducerTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageProducer_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java index 3bda688a34..0709be6065 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); - if(earResURL != null) { - messageProducer_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + earResURL = MessageProducerTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageProducer_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java index e3c513695a..f685765137 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); - if(earResURL != null) { - messageProducer_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + earResURL = MessageProducerTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageProducer_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java index 6f1ed2bd55..5e206f4aea 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/"); - if(earResURL != null) { - messageProducer_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MessageProducerTests.class.getResource("/com/sun/ts/tests/jms/core/messageProducer/.ear.sun-application.xml"); + earResURL = MessageProducerTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageProducer_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java index cd49253af8..5ead81bb12 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); - if(earResURL != null) { - objectMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + earResURL = ObjectMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { objectMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java index e02f8f45a5..310b374ea4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); - if(earResURL != null) { - objectMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + earResURL = ObjectMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { objectMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java index ac45706df2..fa38305292 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); - if(earResURL != null) { - objectMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + earResURL = ObjectMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { objectMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java index 6826f372ce..5c6d4923dd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/"); - if(earResURL != null) { - objectMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = ObjectMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/objectMsgQueue/.ear.sun-application.xml"); + earResURL = ObjectMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { objectMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java index f366648ebd..8cbca2af1a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); - if(earResURL != null) { - queueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + earResURL = QueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java index 80a045974c..6e53f09210 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); - if(earResURL != null) { - queueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + earResURL = QueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java index a57fe2e7f6..b0b1ed1003 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); - if(earResURL != null) { - queueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + earResURL = QueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java index f3b7095f49..859ccfae2c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/"); - if(earResURL != null) { - queueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/queueConnection/.ear.sun-application.xml"); + earResURL = QueueConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java index aa94790251..b9406f1123 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); - if(earResURL != null) { - queueMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + earResURL = QueueHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java index d13929d839..6eaaddfdbe 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); - if(earResURL != null) { - queueMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + earResURL = QueueHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java index 3e21d55336..6a4fccf6d5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); - if(earResURL != null) { - queueMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + earResURL = QueueHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java index f4fc17badf..544d9ac2c9 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/"); - if(earResURL != null) { - queueMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgHeaders/.ear.sun-application.xml"); + earResURL = QueueHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java index 5b61213092..3ed1ce2afe 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); - if(earResURL != null) { - queueMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + earResURL = QueuePropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java index becd0ad928..9c9e84154a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); - if(earResURL != null) { - queueMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + earResURL = QueuePropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java index 9490e07c47..a69ea1f3dd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); - if(earResURL != null) { - queueMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + earResURL = QueuePropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java index 0d98494afe..3b32421767 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/"); - if(earResURL != null) { - queueMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueuePropertyTests.class.getResource("/com/sun/ts/tests/jms/core/queueMsgProperties/.ear.sun-application.xml"); + earResURL = QueuePropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queueMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java index 692971b1e5..39bc51ca63 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsAppclientTest.java @@ -104,12 +104,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); - if(earResURL != null) { - queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + earResURL = QueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java index b520185370..8adda903ac 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsEjbTest.java @@ -148,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); - if(earResURL != null) { - queuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + earResURL = QueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java index d266da5a1b..4931736cee 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsJspTest.java @@ -127,12 +127,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); - if(earResURL != null) { - queuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + earResURL = QueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java index 4755fc69bd..63727d8679 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsServletTest.java @@ -120,12 +120,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/"); - if(earResURL != null) { - queuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = QueueTests.class.getResource("/com/sun/ts/tests/jms/core/queuetests/.ear.sun-application.xml"); + earResURL = QueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { queuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java index 1b7aa82bb4..8b2e8b07c6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); - if(earResURL != null) { - selectorQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + earResURL = MsgSelectorQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java index 86f227f7c8..33e162e4f0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); - if(earResURL != null) { - selectorQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + earResURL = MsgSelectorQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java index 3345939fcb..edbab51b75 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); - if(earResURL != null) { - selectorQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + earResURL = MsgSelectorQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java index 57913beebe..cc70d450ac 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/"); - if(earResURL != null) { - selectorQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/.ear.sun-application.xml"); + earResURL = MsgSelectorQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java index 843124c9c1..bcce5bd4b3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); - if(earResURL != null) { - selectorTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + earResURL = MsgSelectorTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java index b8ce709cb9..36ad5a3be5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); - if(earResURL != null) { - selectorTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + earResURL = MsgSelectorTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java index 6d4a494090..616be772de 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); - if(earResURL != null) { - selectorTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + earResURL = MsgSelectorTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java index 22b4c605b9..1d21f950ec 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/"); - if(earResURL != null) { - selectorTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MsgSelectorTopicTests.class.getResource("/com/sun/ts/tests/jms/core/selectorTopic/.ear.sun-application.xml"); + earResURL = MsgSelectorTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { selectorTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java index b06a7c15bc..805b143019 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); - if(earResURL != null) { - sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + earResURL = SessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java index cdcd909543..7898be6c26 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); - if(earResURL != null) { - sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + earResURL = SessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java index 395e4983c6..6d44a3035b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); - if(earResURL != null) { - sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + earResURL = SessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java index 1bb90582ec..c1715b0c08 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/"); - if(earResURL != null) { - sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = SessionTests.class.getResource("/com/sun/ts/tests/jms/core/sessiontests/.ear.sun-application.xml"); + earResURL = SessionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java index 2f1e657138..a8d8cd5038 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); - if(earResURL != null) { - streamMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + earResURL = StreamMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgQueue_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java index 25cf22cb1d..ba23017f09 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsEjbTest.java @@ -138,12 +138,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); - if(earResURL != null) { - streamMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + earResURL = StreamMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgQueue_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java index 66973ae168..164630d2ca 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsJspTest.java @@ -120,12 +120,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); - if(earResURL != null) { - streamMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + earResURL = StreamMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgQueue_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java index efda78a2ad..fdab83150d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsServletTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/"); - if(earResURL != null) { - streamMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgQueueTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgQueue/.ear.sun-application.xml"); + earResURL = StreamMsgQueueTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgQueue_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java index 1ad5c27720..bfc4534b24 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); - if(earResURL != null) { - streamMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + earResURL = StreamMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgTopic_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java index 7d23996836..2852269972 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); - if(earResURL != null) { - streamMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + earResURL = StreamMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgTopic_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java index ada87f2e33..e2df425fae 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); - if(earResURL != null) { - streamMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + earResURL = StreamMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgTopic_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java index 017d346f0c..9943d88151 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/"); - if(earResURL != null) { - streamMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = StreamMsgTopicTests.class.getResource("/com/sun/ts/tests/jms/core/streamMsgTopic/.ear.sun-application.xml"); + earResURL = StreamMsgTopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { streamMsgTopic_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java index 74b23b4635..e6470b4164 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); - if(earResURL != null) { - topicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + earResURL = TopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicConnection_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java index 2b7c6f5e81..aaea228eb9 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); - if(earResURL != null) { - topicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + earResURL = TopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicConnection_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java index 1d44d4a755..d038dbc47b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); - if(earResURL != null) { - topicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + earResURL = TopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicConnection_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java index 3f729b0a01..d295721011 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/"); - if(earResURL != null) { - topicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicConnectionTests.class.getResource("/com/sun/ts/tests/jms/core/topicConnection/.ear.sun-application.xml"); + earResURL = TopicConnectionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicConnection_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java index ece5db7e9d..7ab33787ca 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); - if(earResURL != null) { - topicMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + earResURL = TopicHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgHeaders_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java index 994a6448a9..d9072414d5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); - if(earResURL != null) { - topicMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + earResURL = TopicHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgHeaders_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java index 717cd570bf..04a37b0621 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); - if(earResURL != null) { - topicMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + earResURL = TopicHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgHeaders_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java index c8800d1cfd..08977c5a26 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/"); - if(earResURL != null) { - topicMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicHeaderTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgHeaders/.ear.sun-application.xml"); + earResURL = TopicHeaderTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgHeaders_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java index 1b21364a1d..7cc761866e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); - if(earResURL != null) { - topicMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + earResURL = TopicPropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgProperties_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java index 833e1d0e62..887d6f43fd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); - if(earResURL != null) { - topicMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + earResURL = TopicPropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgProperties_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java index f6c5f5a593..f0d9cfdb2f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); - if(earResURL != null) { - topicMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + earResURL = TopicPropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgProperties_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java index ccfe13650d..9c1c10ac44 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/"); - if(earResURL != null) { - topicMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicPropertyTests.class.getResource("/com/sun/ts/tests/jms/core/topicMsgProperties/.ear.sun-application.xml"); + earResURL = TopicPropertyTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topicMsgProperties_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java index 182c78feda..e26e530c01 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); - if(earResURL != null) { - topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + earResURL = TopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java index c068ddf739..0a56a032f4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); - if(earResURL != null) { - topictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + earResURL = TopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java index c90e96525e..534d62edc3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); - if(earResURL != null) { - topictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + earResURL = TopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java index e3add70cb2..25f6550d94 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/"); - if(earResURL != null) { - topictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TopicTests.class.getResource("/com/sun/ts/tests/jms/core/topictests/.ear.sun-application.xml"); + earResURL = TopicTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { topictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java index 4139afcb57..3edadb64da 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/"); - if(earResURL != null) { - jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java index c965e268f0..4a2e8312a6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientAppclientTest.java @@ -105,12 +105,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/"); - if(earResURL != null) { - jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java index 9f489a5268..89d85afa25 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientAppclientTest.java @@ -103,12 +103,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/"); - if(earResURL != null) { - jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java index b6f137110d..a08042c893 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientAppclientTest.java @@ -97,12 +97,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/"); - if(earResURL != null) { - listenerexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { listenerexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java index 6486fa5f15..856d9e18d3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientAppclientTest.java @@ -96,12 +96,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/"); - if(earResURL != null) { - messageconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java index adbd746bfe..04a07ad293 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientAppclientTest.java @@ -103,12 +103,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageproducertests/"); - if(earResURL != null) { - messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/appclient/messageproducertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java index 2f03ba0a43..924e34363d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); - if(earResURL != null) { - connectionfactorytests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { connectionfactorytests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java index 3d17e648fe..34e744ab31 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); - if(earResURL != null) { - connectionfactorytests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { connectionfactorytests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java index 789da3f034..f1cb326b83 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); - if(earResURL != null) { - connectionfactorytests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { connectionfactorytests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java index cfb2e2460a..c8a23a2793 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/"); - if(earResURL != null) { - connectionfactorytests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/connectionfactorytests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { connectionfactorytests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java index 365a49081f..5248ddd9fb 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); - if(earResURL != null) { - jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsconsumertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java index 7e15750f99..295b5fcba6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); - if(earResURL != null) { - jmsconsumertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsconsumertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java index 4a47a9c987..a5989a3664 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); - if(earResURL != null) { - jmsconsumertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsconsumertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java index 9e1ae3ef37..58a0bfa1cd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/"); - if(earResURL != null) { - jmsconsumertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsconsumertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsconsumertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java index 40f853f9df..fe1a9bd7cd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); - if(earResURL != null) { - jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontextqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java index b4f2371672..daf087de43 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); - if(earResURL != null) { - jmscontextqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontextqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java index 9bae1be155..9746dbb8bc 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); - if(earResURL != null) { - jmscontextqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontextqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java index 8c995ab10d..2f59630c03 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/"); - if(earResURL != null) { - jmscontextqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontextqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontextqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java index 7fe6124aef..9032bc48c8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); - if(earResURL != null) { - jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontexttopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java index 818e0fe7a0..e0cfd9bfbd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); - if(earResURL != null) { - jmscontexttopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontexttopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java index 9caa512b49..74c6b823c2 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); - if(earResURL != null) { - jmscontexttopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontexttopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java index 7eabd21ea4..e4638db39c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/"); - if(earResURL != null) { - jmscontexttopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmscontexttopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmscontexttopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java index 552e6219fa..f2e1d9854e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); - if(earResURL != null) { - jmsproducerqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducerqueuetests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java index d5e2f4601a..6b6961c45e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); - if(earResURL != null) { - jmsproducerqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducerqueuetests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java index e9ea4713eb..8ee2a2a048 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); - if(earResURL != null) { - jmsproducerqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducerqueuetests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java index 90df406388..f3af391f95 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/"); - if(earResURL != null) { - jmsproducerqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducerqueuetests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java index ce2e17cedc..e0a5440d1a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); - if(earResURL != null) { - jmsproducertopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducertopictests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java index dc69c936ab..12bdc47cce 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); - if(earResURL != null) { - jmsproducertopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducertopictests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java index d19513f2f8..38ed493517 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); - if(earResURL != null) { - jmsproducertopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducertopictests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java index 8fd6bcef13..9ee3206993 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/"); - if(earResURL != null) { - jmsproducertopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/jmsproducertopictests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jmsproducertopictests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java index b669d7bbdd..a023e2d5b4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientAppclientTest.java @@ -101,12 +101,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); - if(earResURL != null) { - messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageproducertests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java index 7ec48fa459..a8b8aa9316 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientEjbTest.java @@ -137,12 +137,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); - if(earResURL != null) { - messageproducertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageproducertests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java index 7ea47f4588..74eb7b5ae6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java @@ -120,12 +120,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); - if(earResURL != null) { - messageproducertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageproducertests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java index 29d3d3a982..a0e8d98156 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientServletTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/"); - if(earResURL != null) { - messageproducertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { messageproducertests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java index a150f88b22..c30dc11643 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientAppclientTest.java @@ -98,12 +98,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); - if(earResURL != null) { - runtimeexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { runtimeexceptiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java index 2d655c03e1..a60c756232 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientEjbTest.java @@ -133,12 +133,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); - if(earResURL != null) { - runtimeexceptiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { runtimeexceptiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java index e70d5e5fab..a72646e5c6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientJspTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); - if(earResURL != null) { - runtimeexceptiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { runtimeexceptiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java index e84e8eb29e..6d7e8cc6cd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientServletTest.java @@ -106,12 +106,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/"); - if(earResURL != null) { - runtimeexceptiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/runtimeexceptiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { runtimeexceptiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java index 778efa01c1..34360209cb 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); - if(earResURL != null) { - sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java index d85eb86a55..c79ee6956d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); - if(earResURL != null) { - sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java index e3a975012d..ee90ab0879 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); - if(earResURL != null) { - sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java index 6964776c29..075a00f491 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/"); - if(earResURL != null) { - sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/sessiontests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { sessiontests_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java index 4408c5b4f2..302deae2e1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/"); - if(earResURL != null) { - jms_ejb_queueCMTTests_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jms_ejb_queueCMTTests_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java index 492356c014..63559b7516 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/"); - if(earResURL != null) { - jms_ejb_sessionQtests_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionQtests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jms_ejb_sessionQtests_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java index 6e8b5f3626..f7b9d41f9a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/"); - if(earResURL != null) { - jms_ejb_sessionTtests_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee/ejb/sessionTtests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jms_ejb_sessionTtests_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java index 62dafd3c96..c1740c2595 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsEjbTest.java @@ -133,12 +133,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/"); - if(earResURL != null) { - transaction_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/.ear.sun-application.xml"); + earResURL = TransactionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { transaction_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java index e4c3ecbd73..4b8dd50055 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsJspTest.java @@ -117,12 +117,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/"); - if(earResURL != null) { - transaction_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/.ear.sun-application.xml"); + earResURL = TransactionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { transaction_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java index e3d2acabaf..8c0b20681c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsServletTest.java @@ -110,12 +110,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/"); - if(earResURL != null) { - transaction_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = TransactionTests.class.getResource("/com/sun/ts/tests/jms/ee/ejbweb/xa/.ear.sun-application.xml"); + earResURL = TransactionTests.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { transaction_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java index bda2d16596..fe4642ef3f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/ClientTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/"); - if(earResURL != null) { - mdb_exceptQ_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_exceptQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java index 381654676d..061c90efdc 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/ClientTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/"); - if(earResURL != null) { - mdb_exceptT_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_exceptT_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java index c3e6b19613..eb95136ac5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/"); - if(earResURL != null) { - mdb_msgHdrQ_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgHdrQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java index 1fe002853b..5f08554711 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/"); - if(earResURL != null) { - mdb_msgHdrT_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgHdrT_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java index a0589eaade..3874df5e35 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/"); - if(earResURL != null) { - mdb_msgPropsQ_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgPropsQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java index 3a55364592..cc98b62325 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/"); - if(earResURL != null) { - mdb_msgPropsT_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgPropsT_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java index 37c4ee3b6f..db1d93f7ae 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/"); - if(earResURL != null) { - mdb_msgTypesQ1_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgTypesQ1_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java index 7d45478e94..1e9e09bc84 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/"); - if(earResURL != null) { - mdb_msgTypesQ2_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgTypesQ2_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java index 08daf0105f..c781f85c97 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/"); - if(earResURL != null) { - mdb_msgTypesQ3_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgTypesQ3_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java index debd4487cb..55c690e99d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/"); - if(earResURL != null) { - mdb_msgTypesT1_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgTypesT1_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java index 9aaf4735af..b8f22299e8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/"); - if(earResURL != null) { - mdb_msgTypesT2_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgTypesT2_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java index ea5c38b374..1f5474a9ff 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/"); - if(earResURL != null) { - mdb_msgTypesT3_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msgTypesT3_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java index 3ea8e75456..c6a63ee208 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/ClientTest.java @@ -116,12 +116,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/"); - if(earResURL != null) { - mdb_asynch_receives_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_rec/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_asynch_receives_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java index d8ddfd184f..7b5f546f8e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/"); - if(earResURL != null) { - mdb_sndQ_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_sndQ_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java index e82d33abfc..d4fb086a71 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/ClientTest.java @@ -115,12 +115,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/"); - if(earResURL != null) { - mdb_sndToQueue_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_sndToQueue_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java index 7c541bfb70..1c3667bf77 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/ClientTest.java @@ -116,12 +116,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/"); - if(earResURL != null) { - mdb_sndToTopic_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_sndToTopic_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java index dbd60fbd33..d6291045c6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/ClientTest.java @@ -113,12 +113,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/"); - if(earResURL != null) { - mdb_synchrec_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_synchrec_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java index e6fe7979ca..19b4c3547c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/ClientTest.java @@ -114,12 +114,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/"); - if(earResURL != null) { - mdb_msg_xa_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = MDBClient.class.getResource("/com/sun/ts/tests/jms/ee/mdb/xa/.ear.sun-application.xml"); + earResURL = MDBClient.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { mdb_msg_xa_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java index 534079d8c5..d9da999876 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientTest.java @@ -104,12 +104,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/ejbweb/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { cditestsejbweb_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/ejbweb/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { cditestsejbweb_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -151,7 +151,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/./application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/./application.xml"); if(earResURL != null) { cditestsejbweb_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java index cd91477071..f91050e30b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientTest.java @@ -65,12 +65,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/mdb/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { cditestsmdb_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/mdb/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { cditestsmdb_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -112,7 +112,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/./application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/./application.xml"); if(earResURL != null) { cditestsmdb_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java index 817d098261..f573836cd1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientTest.java @@ -68,12 +68,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.tests.jms.ee20.cditests.usecases.CMBean2IF.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/cditests/usecases/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { cditestsusecases_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/cditests/usecases/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { cditestsusecases_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -120,7 +120,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/./application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/./application.xml"); if(earResURL != null) { cditestsusecases_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java index f41cae0164..76c653aa40 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientTest.java @@ -119,7 +119,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/application.xml"); if(earResURL != null) { queue_selectorauto_annotated_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java index 6a58e74352..2786bebde8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientTest.java @@ -120,7 +120,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/application.xml"); if(earResURL != null) { queue_selectorauto_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java index 9116fa5e02..f6608786a1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientTest.java @@ -119,7 +119,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/application.xml"); if(earResURL != null) { queue_selectordups_annotated_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java index 929769d5cf..a1d1e752a8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientTest.java @@ -120,7 +120,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/application.xml"); if(earResURL != null) { queue_selectordups_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java index e378fee1a0..cc65565c23 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientTest.java @@ -120,7 +120,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/application.xml"); if(earResURL != null) { topic_noselnocidautodurable_annotated_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java index e43a9cebf4..7ab3f639e4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientTest.java @@ -121,7 +121,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/application.xml"); if(earResURL != null) { topic_noselnocidautodurable_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java index 8b97bccc64..0951587586 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientTest.java @@ -120,7 +120,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/application.xml"); if(earResURL != null) { topic_selectorautociddurable_annotated_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java index ea4246642d..eeeace425c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientTest.java @@ -121,7 +121,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/application.xml"); if(earResURL != null) { topic_selectorautociddurable_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java index 1a37a0137d..831304a6bf 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientTest.java @@ -120,7 +120,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/application.xml"); if(earResURL != null) { topic_selectordupsnondurable_annotated_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java index 9a4baae39b..e88d86c61e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientTest.java @@ -121,7 +121,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/application.xml"); if(earResURL != null) { topic_selectordupsnondurable_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java index 4e90dde6a4..2be9017017 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientTest.java @@ -100,12 +100,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jms/ee20/resourcedefs/annotations/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { resourcedefs_annotations_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { resourcedefs_annotations_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -147,7 +147,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/./application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/./application.xml"); if(earResURL != null) { resourcedefs_annotations_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java index e96a17ab01..f507f3122f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientAppclientTest.java @@ -100,12 +100,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); - if(earResURL != null) { - resourcedefs_descriptor_appclient_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { resourcedefs_descriptor_appclient_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java index fd43b4951a..f54966f254 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientEjbTest.java @@ -136,12 +136,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); - if(earResURL != null) { - resourcedefs_descriptor_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { resourcedefs_descriptor_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java index 8eedc2bdf1..8a9d67150a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientJspTest.java @@ -119,12 +119,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); - if(earResURL != null) { - resourcedefs_descriptor_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { resourcedefs_descriptor_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java index 0cf148dff6..678ef9872e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientServletTest.java @@ -112,12 +112,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/"); - if(earResURL != null) { - resourcedefs_descriptor_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { resourcedefs_descriptor_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); } From e293bd5ece810b08f3cd340470b14692519a541b Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Sun, 25 Aug 2024 19:12:56 -0600 Subject: [PATCH 3/4] Fix the jsp_vehicle.jsp import of the old javatest Status Signed-off-by: Scott M Stark --- .../testapp/files/TestAppClient.java.src | 2 +- .../common/vehicle/jsp/contentRoot/jsp_vehicle.jsp | 2 +- .../datasource/appclientejb/Client.java.template | 2 +- .../selectorQueue/MsgSelectorQueueTestsJspTest.java | 12 ++---------- .../core20/messageproducertests/ClientJspTest.java | 12 ++---------- .../resourcedefs/annotations/files/Client.java.src | 2 +- 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/appclient/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src b/appclient/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src index e6a9f25821..1c4ade50e2 100644 --- a/appclient/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src +++ b/appclient/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src @@ -26,7 +26,7 @@ import java.util.Properties; import com.sun.ts.lib.harness.EETest; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.lib.util.TSNamingContext; -import com.sun.javatest.Status; +import com.sun.ts.lib.harness.Status; import jakarta.mail.Session; import jakarta.mail.MailSessionDefinition; import jakarta.ejb.EJB; diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp b/common/src/main/java/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp index 3ee91e0e29..3ef7be806e 100644 --- a/common/src/main/java/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp +++ b/common/src/main/java/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp @@ -24,7 +24,7 @@ <%@ page import="com.sun.ts.lib.util.*" %> <%@ page import="com.sun.ts.lib.harness.*" %> <%@ page import="com.sun.ts.lib.porting.*" %> -<%@ page import="com.sun.javatest.Status" %> +<%@ page import="com.sun.ts.lib.harness.Status" %> <%@ page session="false" %> <%! Properties properties = null; diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/misc/datasource/appclientejb/Client.java.template b/ejb30/src/main/java/com/sun/ts/tests/ejb30/misc/datasource/appclientejb/Client.java.template index 10e58fec50..b060f9d50b 100644 --- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/misc/datasource/appclientejb/Client.java.template +++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/misc/datasource/appclientejb/Client.java.template @@ -28,7 +28,7 @@ import jakarta.annotation.sql.DataSourceDefinition; import jakarta.annotation.sql.DataSourceDefinitions; import jakarta.ejb.EJB; -import com.sun.javatest.Status; +import com.sun.ts.lib.harness.Status; import com.sun.ts.lib.harness.EETest; import com.sun.ts.tests.ejb30.assembly.appres.common.AppResRemoteIF; import com.sun.ts.tests.ejb30.common.helper.Helper; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java index edbab51b75..153eaf0e79 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsJspTest.java @@ -75,12 +75,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class ); // The web.xml descriptor - URL warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + URL warResURL = MsgSelectorQueueTests.class.getResource("jsp_vehicle_web.xml"); if(warResURL != null) { selectorQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = MsgSelectorQueueTests.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + warResURL = MsgSelectorQueueTests.class.getResource("selectorQueue_jsp_vehicle_web.war.sun-web.xml"); if(warResURL != null) { selectorQueue_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -88,14 +88,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Any libraries added to the war // Web content - warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); - if(warResURL != null) { - selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); - } - warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/jms/core/selectorQueue/jsp_vehicle_web.xml"); - if(warResURL != null) { - selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); - } warResURL = MsgSelectorQueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); if(warResURL != null) { selectorQueue_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java index 74eb7b5ae6..ea398f72f6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientJspTest.java @@ -76,12 +76,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class ); // The web.xml descriptor - URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); + URL warResURL = Client.class.getResource("jsp_vehicle_web.xml"); if(warResURL != null) { messageproducertests_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("messageproducertests_jsp_vehicle_web.war.sun-web.xml"); if(warResURL != null) { messageproducertests_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -89,14 +89,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Any libraries added to the war // Web content - warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml"); - if(warResURL != null) { - messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); - } - warResURL = Client.class.getResource("/com/sun/ts/tests/jms/core20/messageproducertests/jsp_vehicle_web.xml"); - if(warResURL != null) { - messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/jsp_vehicle_web.xml"); - } warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html"); if(warResURL != null) { messageproducertests_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src index 3e207e4625..1f70634978 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src @@ -21,7 +21,7 @@ import java.net.URL; import java.net.URLConnection; import java.util.Properties; -import com.sun.javatest.Status; +import com.sun.ts.lib.harness.Status; import com.sun.ts.lib.harness.EETest; import com.sun.ts.lib.porting.TSURL; import com.sun.ts.lib.util.TSNamingContext; From e30b75d2058fc4bd155331df8452ad128383882f Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Sun, 25 Aug 2024 19:30:12 -0600 Subject: [PATCH 4/4] Remove obsolete innerclasses in applcient tests Signed-off-by: Scott M Stark --- .../ClosedQueueConnectionTestsAppclientTest.java | 4 ---- .../ClosedQueueReceiverTestsAppclientTest.java | 2 -- .../ClosedQueueSessionTestsAppclientTest.java | 2 -- .../ClosedTopicConnectionTestsAppclientTest.java | 4 ---- .../ClosedTopicSessionTestsAppclientTest.java | 2 -- .../core/appclient/queuetests/QueueTestsAppclientTest.java | 2 -- .../core/appclient/topictests/TopicTestsAppclientTest.java | 2 -- 7 files changed, 18 deletions(-) diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java index 1d4e1cf9c9..ed650f940d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsAppclientTest.java @@ -77,10 +77,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.jms.common.MessageTestImpl.class ); - closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$1.class"); - closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$2.class"); - closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$1.class"); - closedQueueConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests$2.class"); // The application-client.xml descriptor URL resURL = ClosedQueueConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java index 1ee1b8b962..ec74bcd77d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverTestsAppclientTest.java @@ -75,8 +75,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class ); - closedQueueReceiver_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests$1.class"); - closedQueueReceiver_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests$1.class"); // The application-client.xml descriptor URL resURL = ClosedQueueReceiverTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java index 735410cee7..0f61a235ad 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsAppclientTest.java @@ -87,8 +87,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class ); - closedQueueSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests$1.class"); - closedQueueSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests$1.class"); // The application-client.xml descriptor URL resURL = ClosedQueueSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java index e5e7065659..e61a9e4767 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsAppclientTest.java @@ -77,10 +77,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.jms.common.MessageTestImpl.class ); - closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$1.class"); - closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$2.class"); - closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$1.class"); - closedTopicConnection_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests$2.class"); // The application-client.xml descriptor URL resURL = ClosedTopicConnectionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java index 84fd1be1af..2d70e1f15d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsAppclientTest.java @@ -77,8 +77,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.jms.common.MessageTestImpl.class ); - closedTopicSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests$1.class"); - closedTopicSession_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.closedTopicSession.ClosedTopicSessionTests$1.class"); // The application-client.xml descriptor URL resURL = ClosedTopicSessionTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java index 0bc1e6baf6..4d7a381b48 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsAppclientTest.java @@ -85,8 +85,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.jms.common.SessionThread.class, com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class ); - queuetests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests$1.class"); - queuetests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests$1.class"); // The application-client.xml descriptor URL resURL = QueueTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java index 6e67aa6c6d..9b90c27031 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsAppclientTest.java @@ -85,8 +85,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.jms.common.SessionThread.class, com.sun.ts.tests.jms.common.SerialTestMessageListenerImpl.class ); - topictests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.topictests.TopicTests$1.class"); - topictests_appclient_vehicle_client.addClass("com.sun.ts.tests.jms.core.appclient.topictests.TopicTests$1.class"); // The application-client.xml descriptor URL resURL = TopicTests.class.getResource("/com/sun/ts/tests/common/vehicle/appclient/appclient_vehicle_client.xml");