diff --git a/glassfish-runner/jms-tck/pom.xml b/glassfish-runner/jms-tck/pom.xml index d8308e96dd..e27c99fece 100644 --- a/glassfish-runner/jms-tck/pom.xml +++ b/glassfish-runner/jms-tck/pom.xml @@ -35,8 +35,8 @@ /tmp/ripassword ${admin.pass.file}.encoded /tmp/ri_admin_objects - "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" - "java.naming.provider.url=file:///${jndi.fs.dir}" + java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory + java.naming.provider.url=file:///${jndi.fs.dir} ${project.build.directory}/${glassfish.toplevel.dir}/mq ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin ${ri.home}/bin/imqusermgr @@ -528,7 +528,7 @@ - **/p/** + **/ee*/** ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.jms-api.jar @@ -536,6 +536,9 @@ ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-corba-omgapi.jar ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyclient.jar ${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derby.jar + ${project.build.directory}/${glassfish.toplevel.dir}/mq/lib/imq.jar + ${project.build.directory}/${glassfish.toplevel.dir}/mq/lib/jms.jar + ${project.build.directory}/${glassfish.toplevel.dir}/mq/lib/fscontext.jar jakartatck:jms-tck @@ -546,9 +549,9 @@ javajoe 10000 standalone - /tmp/ri_admin_objects - java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory - java.naming.provider.url=file:///tmp/ri_admin_objects + localhost + 8080 + standalone ${project.build.directory}/${glassfish.toplevel.dir} diff --git a/glassfish-runner/jms-tck/src/test/resources/jndi.properties b/glassfish-runner/jms-tck/src/test/resources/jndi.properties new file mode 100644 index 0000000000..50c75accbc --- /dev/null +++ b/glassfish-runner/jms-tck/src/test/resources/jndi.properties @@ -0,0 +1,28 @@ +# +# Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License v. 2.0, which is available at +# http://www.eclipse.org/legal/epl-2.0. +# +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the +# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +# version 2 with the GNU Classpath Exception, which is available at +# https://www.gnu.org/software/classpath/license.html. +# +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +# + +# Properties for establishing initial JNDI Context. These properties +# are automatically read by JNDI during new InitialContext() as long +# as this file is in the search path. For JMS TCK the Open Message +# Queue uses the JNDI FileSystem Context Provider. +# +# If on a WINDOWS based system then the path below will need to contain +# the drive letter in the path. The path below is for UNIX based systems. +# So for WINDOWS platforms the (java.naming.provider.url) MUST BE: +# java.naming.provider.url=file:///C:/tmp/ri_admin_objects +# +java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory +java.naming.provider.url=file:///tmp/ri_admin_objects diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml index 9f51c83e68..3388d9c18a 100644 --- a/glassfish-runner/pom.xml +++ b/glassfish-runner/pom.xml @@ -39,7 +39,7 @@ glassfish - 7.0.0-M10 + 7.0.0 glassfish7 3.1.0 2.1.0 diff --git a/jms/src/main/java/com/sun/ts/lib/implementation/sun/jms/SunRIJMSObjects.java b/jms/src/main/java/com/sun/ts/lib/implementation/sun/jms/SunRIJMSObjects.java new file mode 100644 index 0000000000..3b1c6ee77b --- /dev/null +++ b/jms/src/main/java/com/sun/ts/lib/implementation/sun/jms/SunRIJMSObjects.java @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package com.sun.ts.lib.implementation.sun.jms; + +import java.util.*; +import java.io.*; +import javax.naming.*; +import jakarta.jms.*; +import com.sun.ts.lib.util.*; +import com.sun.ts.lib.porting.*; + +/** + * This is an implementation of the TSJMSObjectsInterface. An implementation of + * this class must be supplied by any JMS implementation wishing to get JMS + * adminsitered objects: ConnectionFactories, queues and topics. + * + * @author Dianne Jiao + */ + +public class SunRIJMSObjects implements TSJMSObjectsInterface { + private static Context jndiContext = null; + + private static QueueConnectionFactory qcf = null; + + private static TopicConnectionFactory tcf = null; + + private static ConnectionFactory cf = null; + + private jakarta.jms.Topic testTopic = null; + + private jakarta.jms.Queue testQueue = null; + + private void getJNDIContext() throws Exception { + + if (jndiContext == null) { + try { + TestUtil.logTrace("Getting initial context"); + jndiContext = new InitialContext(); + } catch (javax.naming.NamingException ne) { + TestUtil.logErr("Could not create JNDI context because: ", ne); + TestUtil.printStackTrace(ne); + throw ne; + } + } + } + + /** + * This method allows individual implementation to get the Queue + */ + + public jakarta.jms.Queue getQueue(String name) throws Exception { + getJNDIContext(); + + try { + testQueue = (jakarta.jms.Queue) jndiContext.lookup(name); + } catch (Exception e) { + TestUtil.logErr("Failed to lookup Queue"); + TestUtil.printStackTrace(e); + throw e; + } + return testQueue; + } + + /** + * This method allows individual implementation to get the Topic + */ + + public Topic getTopic(String name) throws Exception { + getJNDIContext(); + + try { + testTopic = (Topic) jndiContext.lookup(name); + } catch (Exception e) { + TestUtil.logErr("Failed to lookup Topic"); + TestUtil.printStackTrace(e); + throw e; + } + return testTopic; + } + + /** + * This method allows individual implementation to get the + * QueueConnectionFactory + */ + + public QueueConnectionFactory getQueueConnectionFactory(String name) + throws Exception { + getJNDIContext(); + + try { + qcf = (QueueConnectionFactory) jndiContext.lookup(name); + } catch (Exception e) { + TestUtil.logErr("Failed to lookup QueueConnectionFactory"); + TestUtil.printStackTrace(e); + throw e; + } + return qcf; + } + + /** + * This method allows individual implementation to get the + * TopicConnectionFactory + */ + + public TopicConnectionFactory getTopicConnectionFactory(String name) + throws Exception { + getJNDIContext(); + + try { + tcf = (TopicConnectionFactory) jndiContext.lookup(name); + } catch (Exception e) { + TestUtil.logErr("Failed to lookup TopicConnectionFactory"); + TestUtil.printStackTrace(e); + throw e; + } + return tcf; + } + + /** + * This method allows individual implementation to get the ConnectionFactory + */ + + public ConnectionFactory getConnectionFactory(String name) throws Exception { + getJNDIContext(); + + try { + cf = (ConnectionFactory) jndiContext.lookup(name); + } catch (Exception e) { + TestUtil.logErr("Failed to lookup ConnectionFactory"); + TestUtil.printStackTrace(e); + throw e; + } + return cf; + } +} diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsIT.java index 8c9186ae51..27e4ff02b0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsIT.java @@ -43,14 +43,14 @@ /** * JMS TS tests. Testing method calls on closed QueueConnection objects. */ -public class ClosedQueueConnectionTests { - private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTests"; +public class ClosedQueueConnectionTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedQueueConnectionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueConnectionTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -120,13 +120,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) must be > 0"); } if (user == null) { - throw new Exception("'users' must be null"); + throw new Exception("'users' is null"); } if (password == null) { - throw new Exception("'password' must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); // get ready for new test diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverIT.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverIT.java index c4c1610f6a..94d9ace025 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverIT.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverIT.java @@ -33,12 +33,12 @@ import jakarta.jms.Message; import jakarta.jms.MessageListener; -public class ClosedQueueReceiverTests { - private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTests"; +public class ClosedQueueReceiverIT { + private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTestsIT"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(ClosedQueueReceiverTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueReceiverIT.class.getName()); // JMS objects private static JmsTool tool = null; @@ -118,13 +118,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) must be > 0"); } if (user == null) { - throw new Exception("'user' must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); // get ready for new test diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsIT.java similarity index 95% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsIT.java index 516f707d88..2139445bc4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -36,12 +36,12 @@ /** * JMS TS tests. Testing method calls on closed QueueSession objects. */ -public class ClosedQueueSessionTests { +public class ClosedQueueSessionTestsIT { private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(ClosedQueueSessionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueSessionTestsIT.class.getName()); // JMS objects private static JmsTool tool = null; @@ -124,13 +124,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) must be > 0"); } if (user == null) { - throw new Exception("'user' must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsIT.java index a71244c021..b2b78662e4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsIT.java @@ -38,12 +38,12 @@ /** * JMS product tests. Testing method calls on closed TopicConnection objects. */ -public class ClosedTopicConnectionTests { - private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTests"; +public class ClosedTopicConnectionTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTestsIT"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(ClosedTopicConnectionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedTopicConnectionTestsIT.class.getName()); // JMS objects private static JmsTool tool = null; @@ -111,13 +111,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) must be > 0"); } if (user == null) { - throw new Exception("'user' must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'numProducers' must be null"); + throw new Exception("'numProducers' is null"); } if (mode == null) { - throw new Exception("'mode' must be null"); + throw new Exception("'mode' is null"); } // get ready for new test diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsIT.java index 184bba1ebf..fe5428dd5e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsIT.java @@ -33,12 +33,12 @@ import jakarta.jms.Message; import jakarta.jms.MessageListener; -public class ClosedTopicSessionTests { - private static final String testName = "com.sun.ts.tests.jms.ee.ejbjspservlet.closedTopicSession.ClosedTopicSessionTests"; +public class ClosedTopicSessionTestsIT { + private static final String testName = "com.sun.ts.tests.jms.ee.ejbjspservlet.closedTopicSession.ClosedTopicSessionTestsIT"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(ClosedTopicSessionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedTopicSessionTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsIT.java similarity index 95% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsIT.java index 685f47067c..bbeec78d1e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsIT.java @@ -34,12 +34,12 @@ import jakarta.jms.Session; import jakarta.jms.Topic; -public class InvalidDestTests { - private static final String testName = "com.sun.ts.tests.jms.core.appclient.invalidDest.InvalidDestTests"; +public class InvalidDestTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.appclient.invalidDest.InvalidDestTestsIT"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(InvalidDestTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(InvalidDestTestsIT.class.getName()); // JMS objects private static JmsTool tool = null; @@ -86,13 +86,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } } catch (Exception e) { TestUtil.printStackTrace(e); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsIT.java similarity index 96% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsIT.java index 6f49b9f384..0c8d87ba0a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsIT.java @@ -37,14 +37,14 @@ import jakarta.jms.Session; import jakarta.jms.TextMessage; -public class QueueConnTests { - private static final String testName = "com.sun.ts.tests.jms.core.appclient.queueconn.QueueConnTests"; +public class QueueConnTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.appclient.queueconn.QueueConnTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(QueueConnTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(QueueConnTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -95,13 +95,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) must be > 0"); } if (user == null) { - throw new Exception("'user' must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); connections = new ArrayList(5); 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/QueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsIT.java index 9d97683f19..3d2c055abc 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/QueueTestsIT.java @@ -50,14 +50,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.TopicConnection; -public class QueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.appclient.queuetests.QueueTests"; +public class QueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.appclient.queuetests.QueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(QueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(QueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -113,13 +113,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) must be > 0"); } if (user == null) { - throw new Exception("'user' must be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' must be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'mode' must be null"); + throw new Exception("'mode' is null"); } // for cleanup purposes - set up an array list of the queues the tests use 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/TopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsIT.java index 09b9863497..6a54da9602 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/TopicTestsIT.java @@ -50,14 +50,14 @@ import jakarta.jms.TopicSession; import jakarta.jms.TopicSubscriber; -public class TopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.appclient.topictests.TopicTests"; +public class TopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.appclient.topictests.TopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TopicTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -113,13 +113,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } // for cleanup purposes - set up an array list of the topics the tests use diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsIT.java index 240bef104d..87e808df19 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/TxQueueTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -42,8 +42,8 @@ import jakarta.jms.Session; import jakarta.jms.TextMessage; -public class TxQueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.appclient.txqueuetests.TxQueueTests"; +public class TxQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.appclient.txqueuetests.TxQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); @@ -68,7 +68,7 @@ public class TxQueueTests { ArrayList connections = null; - private static final Logger logger = (Logger) System.getLogger(TxQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TxQueueTestsIT.class.getName()); /* Test setup: */ @@ -100,13 +100,13 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); connections = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsIT.java index 67f8a73949..44c4cdf302 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsIT.java @@ -43,14 +43,14 @@ import jakarta.jms.TopicSession; import jakarta.jms.TopicSubscriber; -public class TxTopicTests { - private static final String testName = "com.sun.ts.tests.jms.ee.ejbjspservlet.txtopictests.TxTopicTests"; +public class TxTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.ee.ejbjspservlet.txtopictests.TxTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TxTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TxTopicTestsIT.class.getName()); // Harness req's private Properties props = null; @@ -413,7 +413,8 @@ public void transactionRollbackOnSessionCloseReceiveTopicTest() throws Exception } } catch (Exception e) { TestUtil.printStackTrace(e); - throw new Exception("transactionRollbackOnSessionCloseReceiveTopicTest"); + e.printStackTrace(); + throw new Exception("transactionRollbackOnSessionCloseReceiveTopicTest", e); } } @@ -491,7 +492,8 @@ public void transactionRollbackOnPublishTopicTest() throws Exception { } } catch (Exception e) { TestUtil.printStackTrace(e); - throw new Exception("transactionRollbackOnPublishTopicTest"); + e.printStackTrace(); + throw new Exception("transactionRollbackOnPublishTopicTest", e); } } @@ -671,7 +673,8 @@ public void txRollbackOnConnectionCloseReceiveTopicTest() throws Exception { } } catch (Exception e) { TestUtil.printStackTrace(e); - throw new Exception("txRollbackOnConnectionCloseReceiveTopicTest"); + e.printStackTrace(); + throw new Exception("txRollbackOnConnectionCloseReceiveTopicTest", e); } } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsIT.java index 281195d746..98b343aeb7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsIT.java @@ -33,14 +33,14 @@ import jakarta.jms.BytesMessage; import jakarta.jms.MessageNotWriteableException; -public class BytesMsgQueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTests"; +public class BytesMsgQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(BytesMsgQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(BytesMsgQueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -91,13 +91,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); connections = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsIT.java index 0670bec269..035655c7ce 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -33,14 +33,14 @@ import jakarta.jms.BytesMessage; import jakarta.jms.MessageNotWriteableException; -public class BytesMsgTopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTests"; +public class BytesMsgTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(BytesMsgTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(BytesMsgTopicTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -89,13 +89,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } // get ready for new test diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsIT.java index 77f8fd4681..1b8c7577bd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsIT.java @@ -49,14 +49,14 @@ /** * JMS TS tests. Testing method calls on closed QueueConnection objects. */ -public class ClosedQueueConnectionTests { - private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTests"; +public class ClosedQueueConnectionTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedQueueConnectionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueConnectionTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -127,13 +127,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'users' in must not be null"); + throw new Exception("'users' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsIT.java index 8b3763a465..729ae3e25d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsIT.java @@ -36,14 +36,14 @@ /** * JMS TS tests. Testing method calls on closed QueueReceiver objects. */ -public class ClosedQueueReceiverTests { - private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTests"; +public class ClosedQueueReceiverTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedQueueReceiverTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueReceiverTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -124,13 +124,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsIT.java index f1c787e345..0546c49a76 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/ClosedQueueSenderTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -37,14 +37,14 @@ /** * JMS TS tests. Testing method calls on closed QueueSender objects. */ -public class ClosedQueueSenderTests { - private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTests"; +public class ClosedQueueSenderTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueSender.ClosedQueueSenderTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedQueueSenderTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueSenderTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -113,13 +113,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsIT.java index f4f710be3b..3d10ca886b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/ClosedQueueSessionTestsIT.java @@ -46,14 +46,14 @@ /** * JMS TS tests. Testing method calls on closed QueueSession objects. */ -public class ClosedQueueSessionTests { - private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTests"; +public class ClosedQueueSessionTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueSession.ClosedQueueSessionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedQueueSessionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedQueueSessionTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -130,13 +130,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsIT.java index 58826ac9e5..51ecb35745 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/ClosedTopicConnectionTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -48,14 +48,14 @@ /** * JMS product tests. Testing method calls on closed TopicConnection objects. */ -public class ClosedTopicConnectionTests { - private static final String TestName = "com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTests"; +public class ClosedTopicConnectionTestsIT { + private static final String TestName = "com.sun.ts.tests.jms.core.closedTopicConnection.ClosedTopicConnectionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedTopicConnectionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedTopicConnectionTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -135,13 +135,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'numProducers' in must not be null"); + throw new Exception("'numProducers' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } // get ready for new test diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsIT.java index 599a2b20bf..e607682b8a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/ClosedTopicPublisherTestsIT.java @@ -34,14 +34,14 @@ import jakarta.jms.Message; import jakarta.jms.Topic; -public class ClosedTopicPublisherTests { - private static final String testName = "com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherTests"; +public class ClosedTopicPublisherTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.closedTopicPublisher.ClosedTopicPublisherIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedTopicPublisherTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedTopicPublisherTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsIT.java index fbb3ce40d3..5e36357218 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/ClosedTopicSessionTestsIT.java @@ -42,16 +42,16 @@ import jakarta.jms.TopicPublisher; import jakarta.jms.TopicSubscriber; -public class ClosedTopicSessionTests { +public class ClosedTopicSessionTestsIT { private static final String lookup = "DURABLE_SUB_CONNECTION_FACTORY"; - private static final String testName = "com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTests"; + private static final String testName = "com.sun.ts.tests.jms.core.closedTopicSession.ClosedTopicSessionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedTopicSessionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedTopicSessionTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsIT.java index eade534f36..563a421c5b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/ClosedTopicSubscriberTestsIT.java @@ -33,14 +33,14 @@ import jakarta.jms.Message; import jakarta.jms.Topic; -public class ClosedTopicSubscriberTests { - private static final String testName = "com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTests"; +public class ClosedTopicSubscriberTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.closedTopicSubscriber.ClosedTopicSubscriberTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ClosedTopicSubscriberTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClosedTopicSubscriberTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsIT.java index ad5822ab39..c77b78634e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/ExceptionQueueTestsIT.java @@ -49,14 +49,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class ExceptionQueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTests"; +public class ExceptionQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.exceptionQueue.ExceptionQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ExceptionQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ExceptionQueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -108,10 +108,10 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } queues = new ArrayList(2); connections = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsIT.java index f9344582cb..b769ec91ac 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/ExceptionTopicTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -47,14 +47,14 @@ import jakarta.jms.TopicPublisher; import jakarta.jms.TopicSubscriber; -public class ExceptionTopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTests"; +public class ExceptionTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.exceptionTopic.ExceptionTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ExceptionTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ExceptionTopicTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/ExceptionTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/ExceptionTestIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/ExceptionTest.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/ExceptionTestIT.java index d7bc9ace0e..dbec310dac 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/ExceptionTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/ExceptionTestIT.java @@ -40,14 +40,14 @@ import jakarta.jms.TransactionInProgressException; import jakarta.jms.TransactionRolledBackException; -public class ExceptionTest { - private static final String testName = "com.sun.ts.tests.jms.core.exceptiontests.ExceptionTest"; +public class ExceptionTestIT { + private static final String testName = "com.sun.ts.tests.jms.core.exceptiontests.ExceptionTestIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ExceptionTest.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ExceptionTestIT.class.getName()); /* Test setup: */ diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsIT.java index 4b3f3cf3c5..1b99907f1d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/ForeignMsgQueueTestsIT.java @@ -44,14 +44,14 @@ import jakarta.jms.StreamMessage; import jakarta.jms.TextMessage; -public class ForeignMsgQueueTests { +public class ForeignMsgQueueTestsIT { private static final String testName = "com.sun.ts.tests.jms.core.foreignMsgQueue.ForeignMsgQueueTests"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ForeignMsgQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ForeignMsgQueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -116,10 +116,10 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsIT.java index 6f4745aeec..81f56b5394 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/ForeignMsgTopicTestsIT.java @@ -44,14 +44,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class ForeignMsgTopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTests"; +public class ForeignMsgTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.foreignMsgTopic.ForeignMsgTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ForeignMsgTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ForeignMsgTopicTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -114,10 +114,10 @@ public void setup() throws Exception { throw new Exception("'timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } // get ready for new test diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsIT.java index b884c145f3..b7ef2500e1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/MapMsgQueueTestsIT.java @@ -35,14 +35,14 @@ import jakarta.jms.MessageFormatException; import jakarta.jms.MessageNotWriteableException; -public class MapMsgQueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTests"; +public class MapMsgQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.mapMsgQueue.MapMsgQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MapMsgQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MapMsgQueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -94,13 +94,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsIT.java index 7e29924ce7..ac8e9df9b8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/MapMsgTopicTestsIT.java @@ -34,14 +34,14 @@ import jakarta.jms.MessageFormatException; import jakarta.jms.MessageNotWriteableException; -public class MapMsgTopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTests"; +public class MapMsgTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.mapMsgTopic.MapMsgTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MapMsgTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MapMsgTopicTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -93,13 +93,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsIT.java index de655dcf32..311df838da 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/MessageProducerTestsIT.java @@ -36,14 +36,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class MessageProducerTests { - private static final String testName = "com.sun.ts.tests.jms.core.messageProducer.MessageProducerTests"; +public class MessageProducerTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.messageProducer.MessageProducerTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MessageProducerTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MessageProducerTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/MessageQueueTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/MessageQueueTestIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/MessageQueueTest.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/MessageQueueTestIT.java index 534c88bc7a..53a91c067f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/MessageQueueTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/MessageQueueTestIT.java @@ -37,14 +37,14 @@ import jakarta.jms.StreamMessage; import jakarta.jms.TextMessage; -public class MessageQueueTest { - private static final String testName = "com.sun.ts.tests.jms.core.messageQueue.MessageQueueTest"; +public class MessageQueueTestIT { + private static final String testName = "com.sun.ts.tests.jms.core.messageQueue.MessageQueueTestIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MessageQueueTest.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MessageQueueTestIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -96,13 +96,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'numProducers' in must not be null"); + throw new Exception("'numProducers' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/MessageTopicTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/MessageTopicTestIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/MessageTopicTest.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/MessageTopicTestIT.java index 82c30cd3c5..ddd8383ce7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/MessageTopicTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/MessageTopicTestIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -36,14 +36,14 @@ import jakarta.jms.StreamMessage; import jakarta.jms.TextMessage; -public class MessageTopicTest { - private static final String testName = "com.sun.ts.tests.jms.core.messageTopic.MessageTopicTest"; +public class MessageTopicTestIT { + private static final String testName = "com.sun.ts.tests.jms.core.messageTopic.MessageTopicTestIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MessageTopicTest.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MessageTopicTestIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -93,13 +93,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsIT.java similarity index 95% rename from jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsIT.java index 51172d29f6..479ac8983b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/ObjectMsgQueueTestsIT.java @@ -33,14 +33,14 @@ import jakarta.jms.MessageNotWriteableException; import jakarta.jms.ObjectMessage; -public class ObjectMsgQueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTests"; +public class ObjectMsgQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.objectMsgQueue.ObjectMsgQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ObjectMsgQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ObjectMsgQueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -92,13 +92,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'numConsumers' in must not be null"); + throw new Exception("'numConsumers' is null"); } if (password == null) { - throw new Exception("'numProducers' in must not be null"); + throw new Exception("'numProducers' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/ObjectMsgTopicTest.java b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/ObjectMsgTopicTestIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/ObjectMsgTopicTest.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/ObjectMsgTopicTestIT.java index a1694e24a1..d9fa18b6d2 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/ObjectMsgTopicTest.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/ObjectMsgTopicTestIT.java @@ -32,14 +32,14 @@ import jakarta.jms.ObjectMessage; -public class ObjectMsgTopicTest { - private static final String testName = "com.sun.ts.tests.jms.core.objectMsgTopic.ObjectMsgTopicTest"; +public class ObjectMsgTopicTestIT { + private static final String testName = "com.sun.ts.tests.jms.core.objectMsgTopic.ObjectMsgTopicTestIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(ObjectMsgTopicTest.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ObjectMsgTopicTestIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -89,13 +89,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsIT.java similarity index 96% rename from jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsIT.java index 969bdaebf6..a71f1258fc 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/QueueConnectionTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -37,14 +37,14 @@ import jakarta.jms.Session; import jakarta.jms.TextMessage; -public class QueueConnectionTests { - private static final String testName = "com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTests"; +public class QueueConnectionTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.queueConnection.QueueConnectionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(QueueConnectionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(QueueConnectionTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -96,13 +96,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsIT.java index e557ec7cb1..07a7ff8179 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/QueueHeaderTestsIT.java @@ -40,14 +40,14 @@ import jakarta.jms.StreamMessage; import jakarta.jms.TextMessage; -public class QueueHeaderTests { - private static final String testName = "com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTests"; +public class QueueHeaderTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.queueMsgHeaders.QueueHeaderTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(QueueHeaderTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(QueueHeaderTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -99,13 +99,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsIT.java index 2eb1df750b..0496def5cf 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/QueuePropertyTestsIT.java @@ -36,14 +36,14 @@ import jakarta.jms.MessageNotWriteableException; import jakarta.jms.TextMessage; -public class QueuePropertyTests { - private static final String testName = "com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTests"; +public class QueuePropertyTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.queueMsgProperties.QueuePropertyTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(QueuePropertyTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(QueuePropertyTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -103,13 +103,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } queues = new ArrayList(2); connections = new ArrayList(3); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsIT.java index ab165c6f3a..fbba9d6246 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/QueueTestsIT.java @@ -51,14 +51,14 @@ import jakarta.jms.TemporaryQueue; import jakarta.jms.TextMessage; -public class QueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.queuetests.QueueTests"; +public class QueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.queuetests.QueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(QueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(QueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -123,13 +123,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(10); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsIT.java index e44572e5a8..3a3991c822 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/MsgSelectorQueueTestsIT.java @@ -40,14 +40,14 @@ import jakarta.jms.Session; import jakarta.jms.TemporaryQueue; -public class MsgSelectorQueueTests { - private static final String testName = "com.sun.ts.tests.jms.ee.selectorQueue.MsgSelectorQueueTests"; +public class MsgSelectorQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.ee.selectorQueue.MsgSelectorQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MsgSelectorQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MsgSelectorQueueTestsIT.class.getName()); // JMS objects private transient Message msg = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsIT.java index c2c68d7a1d..811b72545f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/MsgSelectorTopicTestsIT.java @@ -40,14 +40,14 @@ import jakarta.jms.TopicSession; import jakarta.jms.TopicSubscriber; -public class MsgSelectorTopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTests"; +public class MsgSelectorTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.selectorTopic.MsgSelectorTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(MsgSelectorTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MsgSelectorTopicTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsIT.java index d86a549f18..d9c52412e0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/SessionTestsIT.java @@ -43,14 +43,14 @@ import jakarta.jms.Topic; import jakarta.jms.TopicSubscriber; -public class SessionTests { - private static final String testName = "com.sun.ts.tests.jms.core.sessiontests.SessionTests"; +public class SessionTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.sessiontests.SessionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(SessionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(SessionTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -97,13 +97,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { TestUtil.printStackTrace(e); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsIT.java index 576f44ff78..df8f97ee2f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/StreamMsgQueueTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -33,14 +33,14 @@ import jakarta.jms.MessageNotWriteableException; import jakarta.jms.StreamMessage; -public class StreamMsgQueueTests { - private static final String testName = "com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTests"; +public class StreamMsgQueueTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.streamMsgQueue.StreamMsgQueueTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(StreamMsgQueueTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(StreamMsgQueueTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -92,13 +92,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(2); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsIT.java index 47a3a9d374..9f2ef68d0a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/StreamMsgTopicTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -33,14 +33,14 @@ import jakarta.jms.MessageNotWriteableException; import jakarta.jms.StreamMessage; -public class StreamMsgTopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTests"; +public class StreamMsgTopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.streamMsgTopic.StreamMsgTopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(StreamMsgTopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(StreamMsgTopicTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -90,13 +90,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } } catch (Exception e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsIT.java index fc2ed7edb2..d2597a44b7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/TopicConnectionTestsIT.java @@ -38,14 +38,14 @@ import jakarta.jms.TopicSession; import jakarta.jms.TopicSubscriber; -public class TopicConnectionTests { - private static final String testName = "com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTests"; +public class TopicConnectionTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.topicConnection.TopicConnectionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TopicConnectionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TopicConnectionTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsIT.java index 345d06a46e..1550bb27f0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/TopicHeaderTestsIT.java @@ -39,14 +39,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class TopicHeaderTests { - private static final String testName = "com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTests"; +public class TopicHeaderTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.topicMsgHeaders.TopicHeaderTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TopicHeaderTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TopicHeaderTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -113,13 +113,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } } catch (Exception e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsIT.java index cf880160db..40400e8cf8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/TopicPropertyTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -36,14 +36,14 @@ import jakarta.jms.MessageNotWriteableException; import jakarta.jms.TextMessage; -public class TopicPropertyTests { - private static final String testName = "com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTests"; +public class TopicPropertyTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.topicMsgProperties.TopicPropertyTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TopicPropertyTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TopicPropertyTestsIT.class.getName()); // JMS objects private transient JmsTool tool = null; @@ -110,13 +110,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must be null"); + throw new Exception("'user' is null"); } if (password == null) { - throw new Exception("'password' in must be null"); + throw new Exception("'password' is null"); } if (mode == null) { - throw new Exception("'mode' in must be null"); + throw new Exception("'mode' is null"); } } catch (Exception e) { TestUtil.printStackTrace(e); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTests.java b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsIT.java index 95696a152f..0dec9c6415 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/TopicTestsIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -44,14 +44,14 @@ import jakarta.jms.TopicSession; import jakarta.jms.TopicSubscriber; -public class TopicTests { - private static final String testName = "com.sun.ts.tests.jms.core.topictests.TopicTests"; +public class TopicTestsIT { + private static final String testName = "com.sun.ts.tests.jms.core.topictests.TopicTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TopicTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TopicTestsIT.class.getName()); // Harness req's private Properties props = null; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientIT.java index 20d33162f2..78c9e1ad52 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/ClientIT.java @@ -39,14 +39,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.appclient.jmsconsumertests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.appclient.jmsconsumertests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -129,13 +129,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { logger.log(Logger.Level.ERROR, "Caught exception: " + e); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientIT.java index 518655b494..65a7e678a3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/ClientIT.java @@ -52,14 +52,14 @@ import jakarta.jms.StreamMessage; import jakarta.jms.TextMessage; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.appclient.jmscontextqueuetests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -145,13 +145,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(3); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientIT.java index 8bc88c00c4..de095c1af5 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/ClientIT.java @@ -51,14 +51,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.appclient.jmscontexttopictests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -146,13 +146,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientIT.java index 8e738c62e3..0c4452bf02 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -43,14 +43,14 @@ import jakarta.jms.Session; import jakarta.jms.TextMessage; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.appclient.listenerexceptiontests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -194,13 +194,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(3); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientIT.java index 52afb2068e..d287f273a6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/ClientIT.java @@ -38,14 +38,14 @@ import jakarta.jms.Session; import jakarta.jms.TextMessage; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.appclient.messageconsumertests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.appclient.messageconsumertests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -121,13 +121,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { logger.log(Logger.Level.ERROR, "Caught exception: " + e); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientIT.java index 704b6f1c03..979cc6e753 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/ClientIT.java @@ -44,14 +44,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.messageproducertests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.messageproducertests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -127,13 +127,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { logger.log(Logger.Level.ERROR, "Caught exception: " + e); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientIT.java index 43be0c1d32..cbd2ef7fbe 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -41,14 +41,14 @@ import jakarta.jms.TopicConnection; import jakarta.jms.TopicConnectionFactory; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.connectionfactorytests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.connectionfactorytests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -120,13 +120,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } connections = new ArrayList(5); vehicle = System.getProperty("vehicle"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientIT.java index 01aeb97674..9b36bb7c90 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/ClientIT.java @@ -51,14 +51,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.jmsconsumertests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.jmsconsumertests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -124,13 +124,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(3); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientIT.java index 33ab0ffc61..99a9a6df5c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -48,14 +48,14 @@ import jakarta.jms.TemporaryQueue; import jakarta.jms.TextMessage; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.jmscontextqueuetests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.jmscontextqueuetests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -231,13 +231,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(3); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientIT.java index 7d39c6cde1..91b25b7c10 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/ClientIT.java @@ -50,14 +50,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.jmscontexttopictests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.jmscontexttopictests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null, tool2 = null; @@ -246,13 +246,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } connections = new ArrayList(5); @@ -1303,6 +1303,7 @@ public void createSharedDurableConsumerTest2() throws Exception { if (consumer2 != null) consumer2.close(); } catch (Exception e) { + e.printStackTrace(); logger.log(Logger.Level.ERROR, "Caught unexpected exception: " + e); } } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientIT.java index 4a5601d64b..98af025ce1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/ClientIT.java @@ -58,14 +58,14 @@ import jakarta.jms.StreamMessage; import jakarta.jms.TextMessage; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.jmsproducerqueuetests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.jmsproducerqueuetests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -238,13 +238,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } queues = new ArrayList(3); connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientIT.java index c16b6773d1..ac75fae118 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/ClientIT.java @@ -58,14 +58,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.jmsproducertopictests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.jmsproducertopictests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null, tool2 = null; @@ -251,13 +251,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } connections = new ArrayList(5); 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/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/ClientIT.java index 89e0c00716..de5913c4b5 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/ClientIT.java @@ -42,14 +42,14 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.messageproducertests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.messageproducertests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool tool = null; @@ -107,13 +107,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } } catch (Exception e) { logger.log(Logger.Level.ERROR, "Caught exception: " + e.getMessage()); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientIT.java index 1b17838546..fc281ad18c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/ClientIT.java @@ -25,14 +25,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.runtimeexceptiontests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.runtimeexceptiontests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* Test setup: */ diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientIT.java index 00a65fd7aa..2f872caf45 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/ClientIT.java @@ -53,14 +53,14 @@ import jakarta.jms.Topic; import jakarta.jms.TopicSubscriber; -public class Client { - private static final String testName = "com.sun.ts.tests.jms.core20.sessiontests.Client"; +public class ClientIT { + private static final String testName = "com.sun.ts.tests.jms.core20.sessiontests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // JMS tool which creates and/or looks up the JMS administered objects private transient JmsTool toolT = null; @@ -190,13 +190,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } connections = new ArrayList(5); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientIT.java index f97d3c290a..2540847fa0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/ClientIT.java @@ -34,13 +34,13 @@ import jakarta.jms.DeliveryMode; import jakarta.jms.Queue; -public class Client { +public class ClientIT { - private static final String testName = "com.sun.ts.tests.jms.ee.ejb.queueCMTTests.Client"; + private static final String testName = "com.sun.ts.tests.jms.ee.ejb.queueCMTTests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // Harness req's private Properties props = null; @@ -87,13 +87,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } beanRef.initLogging(props); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientIT.java similarity index 96% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientIT.java index cb779d6fb8..c0e80a19a1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/ClientIT.java @@ -32,13 +32,13 @@ import jakarta.ejb.EJB; -public class Client { +public class ClientIT { - private static final String testName = "com.sun.ts.tests.jms.ee.ejb.sessionQtests.Client"; + private static final String testName = "com.sun.ts.tests.jms.ee.ejb.sessionQtests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); // Harness req's private Properties props = null; @@ -87,13 +87,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } beanRef.initLogging(props); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientIT.java similarity index 95% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientIT.java index 5f1f160444..849a330214 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/ClientIT.java @@ -37,15 +37,15 @@ import jakarta.jms.Topic; import jakarta.jms.TopicSubscriber; -public class Client { +public class ClientIT { - private static final String testName = "com.sun.ts.tests.jms.ee.ejb.sessionTtests.Client"; + private static final String testName = "com.sun.ts.tests.jms.ee.ejb.sessionTtests.ClientIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); private transient Connection connr = null; @@ -109,13 +109,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } beanRef.initLogging(props); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTests.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTests.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsIT.java index 0523318053..c191ac1e7e 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTests.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/TransactionTestsIT.java @@ -48,14 +48,14 @@ import jakarta.jms.TopicSubscriber; import jakarta.transaction.UserTransaction; -public class TransactionTests { - private static final String testName = "com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTests"; +public class TransactionTestsIT { + private static final String testName = "com.sun.ts.tests.jms.ee.ejbweb.xa.TransactionTestsIT"; private static final String testDir = System.getProperty("user.dir"); private static final long serialVersionUID = 1L; - private static final Logger logger = (Logger) System.getLogger(TransactionTests.class.getName()); + private static final Logger logger = (Logger) System.getLogger(TransactionTestsIT.class.getName()); // Naming specific member variables private TSNamingContextInterface context = null; @@ -123,10 +123,10 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (jmsUser == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (jmsPassword == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } context = new TSNamingContext(); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/MDBClientIT.java index 4f263198b8..1bc6359f70 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/MDBClientIT.java @@ -28,7 +28,7 @@ import jakarta.jms.Queue; -public class MDBClient extends Client { +public class MDBClientIT extends Client { // Naming specific member variables private Queue cmtQ; @@ -37,7 +37,7 @@ public class MDBClient extends Client { private Queue bmtQ; - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* * Test setup: diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/MDBClientIT.java index 29fe7153b2..51526541e1 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/MDBClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -28,7 +28,7 @@ import jakarta.jms.Topic; -public class MDBClient extends Client { +public class MDBClientIT extends Client { private Topic bmtT; @@ -36,7 +36,7 @@ public class MDBClient extends Client { private Topic cmtT; - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/MDBClientIT.java index 0a30a235f1..6b43ce4990 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGHdrQ_Test") private static MDB_Q_Test hr; private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/MDBClientIT.java index b9b4f95228..e73decd2c8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGHdrT_Test") private static MDB_T_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/MDBClientIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/MDBClientIT.java index 6cdd6b32bf..b121bd22cb 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/MDBClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGPropsQ_Test") private static MDB_Q_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/MDBClientIT.java index 8682c591a8..be4f514713 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGPropsT_Test") private static MDB_T_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/MDBClientIT.java index 38a92631b7..5716755f25 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/MDBClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGQ1_Test") private static MDB_Q_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/MDBClientIT.java index 0148b3486b..6ad9503fee 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGQ2_Test") private static MDB_Q_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/MDBClientIT.java index 552b1d44b3..8bd1ebb1d7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGQ3_Test") private static MDB_Q_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/MDBClientIT.java index bf10eb1f4b..17facd1af0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGT1_Test") private static MDB_T_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/MDBClientIT.java index 3f31d35070..bd23b9955a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/MDBClientIT.java @@ -31,14 +31,14 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGT2_Test") private static MDB_T_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/MDBClientIT.java index b898e6e5ea..499ff93c50 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/MDBClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -37,14 +37,14 @@ * a queue */ -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_MSGT3_Test") private static MDB_T_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDBClientIT.java index 0d44485e73..884b786db7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDBClientIT.java @@ -31,19 +31,18 @@ import jakarta.ejb.EJB; -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_AR_Test") private static MDB_AR_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* - * @class.setup_props: jms_timeout; user; password; harness.log.port; - * harness.log.traceflag; + * @class.setup_props: jms_timeout; user; password */ @BeforeEach public void setup() throws Exception { @@ -88,6 +87,7 @@ public void setup() throws Exception { * * */ + @Test public void asynRecTextMsgQueueTest() throws Exception { String matchMe; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDB_AR_TestEJB.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDB_AR_TestEJB.java index bb00c6286f..a05f28f2da 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDB_AR_TestEJB.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/MDB_AR_TestEJB.java @@ -112,10 +112,10 @@ public void setup(Properties props) { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (jmsUser == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (jmsPassword == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (qcFactory == null || tcFactory == null || queue == null || rcvrQueue == null || topic == null || sessionContext == null) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDBClientIT.java index 817992c444..70a9f14bc9 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDBClientIT.java @@ -34,14 +34,14 @@ * messages to a Destination */ -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_SNDQ_Test") private static MDB_SNDQ_Test hr = null; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDB_SNDQ_TestEJB.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDB_SNDQ_TestEJB.java index 8f7d971696..966d70cacd 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDB_SNDQ_TestEJB.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/MDB_SNDQ_TestEJB.java @@ -91,10 +91,10 @@ public void setup(Properties props) { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (jmsUser == null) { - throw new Exception("'user' in must not be null"); + throw new Exception("'user' is null"); } if (jmsPassword == null) { - throw new Exception("'password' in must not be null"); + throw new Exception("'password' is null"); } if (cf == null || Dest == null || receiveDest == null || sessionContext == null) { throw new Exception("@Resource injection failed"); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/MDBClientIT.java index d7db5a8ddd..50faec4925 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/MDBClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -36,14 +36,14 @@ * driven bean to send a text, byte, map, stream, and object message to a queue */ -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_SNDToQueue_Test") private static MDB_Q_Test hr; private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/MDBClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/MDBClientIT.java index 9d5d43f02a..c30c94094c 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/MDBClientIT.java @@ -36,14 +36,14 @@ * a topic Sun's EJB Reference Implementation. */ -public class MDBClient { +public class MDBClientIT { @EJB(name = "ejb/MDB_SNDToTopic_Test") private static MDB_T_Test hr; - private Properties props = null; + private Properties props = new Properties(); - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* Test setup: */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/MDBClientIT.java similarity index 97% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/MDBClientIT.java index 3f76adb42e..362bea92a8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/MDBClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,6 +24,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sun.ts.lib.util.TSNamingContext; import com.sun.ts.lib.util.TSNamingContextInterface; @@ -41,12 +42,12 @@ import jakarta.jms.Session; import jakarta.jms.TextMessage; -public class MDBClient { +public class MDBClientIT { // Naming specific member variables private TSNamingContextInterface context = null; - private Properties props = null; + private Properties props = new Properties(); private Queue mdbRcvrQueue; @@ -71,13 +72,13 @@ public class MDBClient { // get this from ts.jte long timeout; - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* * Test setup: * * @class.setup_props: jms_timeout, in milliseconds - how long to wait on - * synchronous receive; user;password;harness.log.port; harness.log.traceflag; + * synchronous receive; user;password * */ @BeforeEach @@ -121,6 +122,7 @@ public void setup() throws Exception { * successfully receive the message * */ + @Test public void test1() throws Exception { String TestCase = "syncRecTest1"; int TestNum = 1; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/MDBClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/MDBClientIT.java similarity index 99% rename from jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/MDBClient.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/MDBClientIT.java index 085f5b380c..769592f8a3 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/MDBClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/MDBClientIT.java @@ -20,6 +20,7 @@ package com.sun.ts.tests.jms.ee.mdb.xa; import java.lang.System.Logger; +import java.util.Properties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,7 +36,7 @@ import jakarta.jms.QueueSession; import jakarta.jms.Topic; -public class MDBClient extends Client { +public class MDBClientIT extends Client { private Queue cmtQ; @@ -45,7 +46,7 @@ public class MDBClient extends Client { private Topic cmtT; - private static final Logger logger = (Logger) System.getLogger(MDBClient.class.getName()); + private static final Logger logger = (Logger) System.getLogger(MDBClientIT.class.getName()); /* * Test setup: @@ -55,6 +56,7 @@ public class MDBClient extends Client { */ @BeforeEach public void setup() throws Exception { + props = new Properties(); props.put("jms_timeout", System.getProperty("jms_property")); props.put("user", System.getProperty("user")); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientIT.java index 749acaabeb..39e61d0e36 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/ClientIT.java @@ -30,7 +30,7 @@ import jakarta.ejb.EJB; -public class Client { +public class ClientIT { // The webserver defaults (overidden by harness properties) private static final String PROTOCOL = "http"; @@ -66,7 +66,7 @@ public class Client { String mode; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* Test setup */ @@ -90,16 +90,16 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } if (hostname == null) { - throw new Exception("'webServerHost' in must not be null"); + throw new Exception("'webServerHost' is null"); } try { portnum = Integer.parseInt(System.getProperty("webServerPort")); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientIT.java index 60e1d24bcc..2860264ba9 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -29,7 +29,7 @@ import jakarta.ejb.EJB; -public class Client { +public class ClientIT { // The webserver defaults (overidden by harness properties) private static final String PROTOCOL = "http"; @@ -65,7 +65,7 @@ public class Client { String mode; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* Test setup */ @@ -89,16 +89,16 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } if (hostname == null) { - throw new Exception("'webServerHost' in must not be null"); + throw new Exception("'webServerHost' is null"); } try { portnum = Integer.parseInt(System.getProperty("webServerPort")); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientIT.java index f9b8d8bb7f..c782af884a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/ClientIT.java @@ -29,7 +29,7 @@ import jakarta.ejb.EJB; -public class Client { +public class ClientIT { // The webserver defaults (overidden by harness properties) private static final String PROTOCOL = "http"; @@ -72,7 +72,7 @@ public class Client { String mode; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* Test setup */ @@ -96,16 +96,16 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } if (hostname == null) { - throw new Exception("'webServerHost' in must not be null"); + throw new Exception("'webServerHost' is null"); } try { portnum = Integer.parseInt(System.getProperty("webServerPort")); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.java index ccf72c75da..9e54992cc8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBaseIT.java similarity index 95% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBaseIT.java index 7683d2c93d..681a83b0ea 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBaseIT.java @@ -20,11 +20,13 @@ package com.sun.ts.tests.jms.ee20.ra.activationconfig.common; +import org.junit.jupiter.api.Test; + import jakarta.annotation.Resource; import jakarta.jms.Queue; import jakarta.jms.QueueConnectionFactory; -abstract public class QueueClientBase extends com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase +abstract public class QueueClientBaseIT extends com.sun.ts.tests.jms.ee20.ra.common.messaging.QueueClientBase implements com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants { @Resource(name = "sendQueue") @@ -60,6 +62,7 @@ protected void initQueueConnectionFactory() { * Sends message and waits for response. The message should reach the target * MDB, and a response should be received by this client. */ + @Test public void test1() throws Exception { sendReceive("test1", 0); } @@ -76,6 +79,7 @@ public void test1() throws Exception { * Sends message and waits for response. The message should not reach the target * MDB, and no response should be received by this client. */ + @Test public void negativeTest1() throws Exception { // the next messages should be filtered out by the ActivationConfigBean sendReceiveNegative("test1", 1); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBaseIT.java similarity index 93% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBaseIT.java index 7512e6a3d1..382b3f9c3f 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBaseIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -20,13 +20,15 @@ package com.sun.ts.tests.jms.ee20.ra.activationconfig.common; +import org.junit.jupiter.api.Test; + import jakarta.annotation.Resource; import jakarta.jms.Queue; import jakarta.jms.QueueConnectionFactory; import jakarta.jms.Topic; import jakarta.jms.TopicConnectionFactory; -abstract public class TopicClientBase extends com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase +abstract public class TopicClientBaseIT extends com.sun.ts.tests.jms.ee20.ra.common.messaging.TopicClientBase implements com.sun.ts.tests.jms.ee20.ra.common.messaging.Constants { @Resource(name = "sendTopic") @@ -69,6 +71,7 @@ protected void initQueueConnectionFactory() { * Sends message and waits for response. The message should reach the target * MDB, and a response should be received by this client. */ + @Test public void test1() throws Exception { sendReceive("test1", 0); } @@ -85,6 +88,7 @@ public void test1() throws Exception { * Sends message and waits for response. The message should not reach the target * MDB, and no response should be received by this client. */ + @Test public void negativeTest1() throws Exception { // the next messages should be filtered out by the ActivationConfigBean sendReceiveNegative("test1", 1); @@ -102,6 +106,7 @@ public void negativeTest1() throws Exception { * Sends message and waits for response. The message should not reach the target * MDB, and no response should be received by this client. */ + @Test public void negativeTest2() throws Exception { // the next messages should be filtered out by the ActivationConfigBean sendReceiveNegative("negativeTest2", 0); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientIT.java similarity index 95% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientIT.java index d297356992..029522aadf 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ClientIT.java @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientIT.java index 27d94e8acf..7a0b6366e0 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientIT.java index e285c25627..0c261d03ec 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientIT.java index 847cbf9772..521a5e6804 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.QueueClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientIT.java similarity index 86% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientIT.java index 788a9deb19..8ad4bb1191 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -18,19 +18,18 @@ * $Id$ */ -package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor; +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated; import java.lang.System.Logger; import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* @@ -53,7 +52,7 @@ public void test1() throws Exception { logger.log(Logger.Level.INFO, " destinationType=jakarta.jms.Topic"); logger.log(Logger.Level.INFO, " acknowledgeMode=Auto-acknowledge"); logger.log(Logger.Level.INFO, " subscriptionDurability=Durable"); - logger.log(Logger.Level.INFO, " subscriptionName=MySubscriptionName4ForRATests"); + logger.log(Logger.Level.INFO, " subscriptionName=MySubscriptionName3ForRATests"); logger.log(Logger.Level.INFO, "Send message to MDB"); logger.log(Logger.Level.INFO, "Receive response from MDB"); sendOnly("test1", 0); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientIT.java similarity index 92% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientIT.java index 1358aabcfc..224c61fc60 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ClientIT.java @@ -18,15 +18,15 @@ * $Id$ */ -package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated; +package com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor; import java.lang.System.Logger; import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; @@ -53,7 +53,7 @@ public void test1() throws Exception { logger.log(Logger.Level.INFO, " destinationType=jakarta.jms.Topic"); logger.log(Logger.Level.INFO, " acknowledgeMode=Auto-acknowledge"); logger.log(Logger.Level.INFO, " subscriptionDurability=Durable"); - logger.log(Logger.Level.INFO, " subscriptionName=MySubscriptionName3ForRATests"); + logger.log(Logger.Level.INFO, " subscriptionName=MySubscriptionName4ForRATests"); logger.log(Logger.Level.INFO, "Send message to MDB"); logger.log(Logger.Level.INFO, "Receive response from MDB"); sendOnly("test1", 0); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientIT.java similarity index 96% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientIT.java index 0530e56ae5..ce9a19e05b 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientIT.java similarity index 96% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientIT.java index 10d43cb841..36ccbbe75d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ClientIT.java @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientIT.java index e103d1997c..ce771b1f36 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientIT.java similarity index 94% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientIT.java index 961702f99e..33522f7f6d 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -24,13 +24,12 @@ import org.junit.jupiter.api.Test; -public class Client extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBase { +public class ClientIT extends com.sun.ts.tests.jms.ee20.ra.activationconfig.common.TopicClientBaseIT { - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* - * @class.setup_props: jms_timeout; user; password; harness.log.traceflag; - * harness.log.port; + * @class.setup_props: jms_timeout; user; password; */ /* diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.java index 0bde8a44df..2667b2c951 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.java @@ -244,21 +244,6 @@ private void initTestProperties(Properties p) throws Exception { throw new Exception("Error getting time"); } - hostname = System.getProperty("harness.host"); - if (hostname == null) { - logger.log(Logger.Level.TRACE, "Hostname is null"); - throw new Exception("Error getting hostname"); - } - traceFlag = System.getProperty("harness.log.traceflag"); - if (traceFlag == null) { - logger.log(Logger.Level.TRACE, "Hostname is null"); - throw new Exception("Error getting traceflag"); - } - logPort = System.getProperty("harness.log.port"); - if (logPort == null) { - logger.log(Logger.Level.TRACE, "logport is null"); - throw new Exception("Error getting port"); - } timeout = Integer.parseInt(time); } } diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientIT.java index 06a1b8ad49..02d25f3be7 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2022 Contributors to Eclipse Foundation. All rights reserved. * * This program and the accompanying materials are made available under the @@ -63,7 +63,7 @@ @JMSConnectionFactoryDefinition(description = "Define Durable TopicConnectionFactory AppClientMyTestDurableTopicConnectionFactory", interfaceName = "jakarta.jms.TopicConnectionFactory", name = "java:comp/env/jms/AppClientMyTestDurableTopicConnectionFactory", user = "j2ee", password = "j2ee", clientId = "MyClientID", properties = { "Property1=10", "Property2=20" }, transactional = false, maxPoolSize = 30, minPoolSize = 20) -public class Client { +public class ClientIT { private static final long serialVersionUID = 1L; // JMS objects @@ -134,7 +134,7 @@ public class Client { @EJB(name = "ejb/JMSResourceDefsEjbClientBean") static EjbClientIF ejbclient; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* Test setup */ @@ -158,16 +158,16 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } if (hostname == null) { - throw new Exception("'webServerHost' in must not be null"); + throw new Exception("'webServerHost' is null"); } try { portnum = Integer.parseInt(System.getProperty("webServerPort")); diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/EjbClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/EjbClient.java index a400dec836..08f0b630d6 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/EjbClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/EjbClient.java @@ -153,13 +153,13 @@ public void init(Properties p) { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } doLookupJMSObjects(); } catch (RemoteLoggingInitException e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java index 7cd84e8c7b..b07ed711b4 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java @@ -204,13 +204,13 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } doLookupJMSObjects(); } catch (Exception e) { diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientIT.java similarity index 98% rename from jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/Client.java rename to jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientIT.java index 4d8c203e64..05364682a8 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/ClientIT.java @@ -39,7 +39,7 @@ import jakarta.jms.Topic; import jakarta.jms.TopicConnectionFactory; -public class Client { +public class ClientIT { private static final String testName = "com.sun.ts.tests.jms.ee20.resourcedefs.descriptor.Client"; private static final String testDir = System.getProperty("user.dir"); @@ -89,7 +89,7 @@ public class Client { String vehicle; - private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + private static final Logger logger = (Logger) System.getLogger(ClientIT.class.getName()); /* Test setup: */ @@ -115,13 +115,13 @@ public void setup() throws Exception { throw new Exception("'jms_timeout' (milliseconds) in must be > 0"); } if (user == null) { - throw new Exception("'user' in must not be null "); + throw new Exception("'user' is null "); } if (password == null) { - throw new Exception("'password' in must not be null "); + throw new Exception("'password' is null "); } if (mode == null) { - throw new Exception("'platform.mode' in must not be null"); + throw new Exception("'platform.mode' is null"); } logger.log(Logger.Level.INFO, "Lookup JMS factories defined in Deployment Descriptors");