Combined JmsPub & JmsSub tests

Author: harshitsharma2801

JMS/README.md

@@ -354,7 +354,7 @@ To run the samples with TLS you need to provide additional arguments;
 
  *A note on the* `Dcom.ibm.mq.cfg.useIBMCipherMappings=false` property
 
-This is needed as the samples were tested in an enviroment with the Oracle JRE installed. Depending on whether you have Oracle or IBM JRE installed, you also need to name the cipher suite/spec accordingly. See the table here [TLS CipherSpecs and CipherSuites in IBM MQ classes for JMS](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.1.0/com.ibm.mq.dev.doc/q113220_.htm)
+This is needed as the samples were tested in an enviroment with the Oracle JRE installed. Depending on whether you have Oracle or IBM JRE installed, you also need to name the cipher suite/spec accordingly. See the table here [TLS CipherSpecs and CipherSuites in IBM MQ classes for JMS](https://www.ibm.com/docs/en/ibm-mq/latest?topic=jms-tls-cipherspecs-ciphersuites-in-mq-classes)
 
 ## Bindings mode
 
@@ -367,7 +367,7 @@ By default these samples will run in client mode. If you do want to run the samp
 to the `env.json` file.
 
 ## Unit Test
-The samples also contain unit tests in `src/test`. These tests require connection with a Queue Manager and use the default `env.json` present in the repository, hence make sure you have at least one valid endpoint in the `env.json`.
+The samples also contain unit tests in `src/test`. These tests require connection with a Queue Manager and use the default `env.json` present in the repository, hence make sure you have at least one valid endpoint in the `env.json`.Also these tests have not been run on a single CPU machine where the behaviour might be different.
 
 To run these tests, Use the following command:
 

JMS/src/test/java/com/ibm/mq/samples/jms/JmsSubTest.java renamed to JMS/src/test/java/com/ibm/mq/samples/jms/JmsPubSubTest.java

@@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package com.ibm.mq.samples.jms;
 
 import org.junit.jupiter.api.Test;
@@ -25,11 +24,9 @@
 
 import org.junit.jupiter.api.BeforeAll;
 
-public class JmsSubTest {
-
- private static TestLogHandler logHandler;
-
+public class JmsPubSubTest {
  //Add a custom logHandler to the logger to get the logs
+ private static TestLogHandler logHandler;
  @BeforeAll
  public static void setUp(){
  Logger logger = Logger.getLogger("com.ibm.mq.samples.jms");
@@ -38,10 +35,9 @@ public static void setUp(){
  logger.addHandler(logHandler);
  }
 
- //Test to verify JmsSub
+ //Test to verify JmsPub and JmsSub
  @Test
- public void testJmsSub(){
-
+ public void testJmsPubSub(){
  //Create a thread for Subscription using JmsSub
  Thread subThread = new Thread(() -> {
  try {
@@ -51,19 +47,15 @@ public void testJmsSub(){
  }
  });
 
- //Create a thread for Publisher 
  Thread pubThread = new Thread(() -> {
  try {
- BasicProducer bp = new BasicProducer(BasicProducer.PRODUCER_PUB);
- bp.send("This is a published message from JMS Basic Pub", 1);
- bp.close();
+ JmsPub.main(null);
  } catch (Exception e) {
  e.printStackTrace();
  }
  });
 
  subThread.start();
-
  //Wait for subscription to take place before publishing
  try {
  Thread.sleep(2000);
@@ -78,12 +70,15 @@ public void testJmsSub(){
  } catch (Exception e) {
  e.printStackTrace();
  }
-
+ 
  //Assert successful subscription using the logs
  String logs = logHandler.getLogs();
  assertTrue(logs.contains("Sub application is starting"));
  assertTrue(logs.contains("consumer created"));
- assertTrue(logs.contains("Received message: This is a published message from JMS Basic Pub"));
+ assertTrue(logs.contains("Pub application is starting"));
+ assertTrue(logs.contains("Publishing messages."));
+ assertTrue(logs.contains("message was sent"));
+ assertTrue(logs.contains("Received message: this is a message 0"));
+ assertTrue(logs.contains("Received message: this is a message 19"));
  }
 }
-