Deprecate java amqp1.0 client

from ui and messaging selenium tests

Author: MarcialRosales

selenium/test/amqp.js

@@ -24,13 +24,49 @@ function getAmqpsConnectionOptions() {
   options['cert'] = fs.readFileSync(path.resolve(certsLocation,'client_rabbitmq_certificate.pem'))
   options['ca'] = fs.readFileSync(path.resolve(certsLocation,'ca_rabbitmq_certificate.pem')) 
 }
-module.exports = {
+function getConnectionOptions() {
+  switch(process.env.RABBITMQ_AMQP_SCHEME || 'amqp'){
+    case 'amqp':
+      return getAmqpConnectionOptions()
+    case 'amqps':
+      return getAmqpsConnectionOptions()
+  }  
+}
+module.exports = {  
+  
   open: () => {
-    switch(process.env.RABBITMQ_AMQP_SCHEME || 'amqp'){
-      case 'amqp':
-        return container.connect(getAmqpConnectionOptions())
-      case 'amqps':
-        return container.connect(getAmqpsConnectionOptions())
-    }    
+    let promise = new Promise((resolve, reject) => {
+      container.on('connection_open', function(context) {
+        resolve()
+      })
+    })
+    let connection = container.connect(getConnectionOptions())
+    let receiver = connection.open_receiver({
+      source: 'examples',
+      target: 'receiver-target',
+      name: 'receiver-link'
+    })
+    let sender = connection.open_sender({
+      target: 'examples',
+      source: 'sender-source',
+      name: 'sender-link'
+    })
+    return {
+      'connection': connection,
+      'promise' : promise,
+      'receiver' : receiver,
+      'sender' : sender
+    }
+  },
+  close: (connection) => {
+    if (connection != null) {
+      connection.close()
+    }
+  },
+  once: (event, callback) => {
+    container.once(event, callback)
+  },
+  on: (event, callback) => {
+    container.on(event, callback)
   }
 }

selenium/test/authnz-msg-protocols/amqp10.js

@@ -1,20 +1,20 @@
 const assert = require('assert')
 const { tokenFor, openIdConfiguration } = require('../utils')
 const { reset, expectUser, expectVhost, expectResource, allow, verifyAll } = require('../mock_http_backend')
+const { open: openAmqp, once: onceAmqp, on: onAmqp, close: closeAmqp } = require('../amqp')
 const {execSync} = require('child_process')
 
-var container = require('rhea')  // https://github.com/amqp/rhea
 var receivedAmqpMessageCount = 0
 var untilConnectionEstablished = new Promise((resolve, reject) => {
-  container.on('connection_open', function(context) {
+  onAmqp('connection_open', function(context) {
     resolve()
   })
 })
 
-container.on('message', function (context) {
+onAmqp('message', function (context) {
     receivedAmqpMessageCount++
 })
-container.once('sendable', function (context) {
+onceAmqp('sendable', function (context) {
     context.sender.send({body:'first message'})    
 })
 
@@ -33,7 +33,8 @@ describe('Having AMQP 1.0 protocol enabled and the following auth_backends: ' +
   let usemtls = process.env.AMQP_USE_MTLS
   let amqpClientCommand = "npm run amqp10_roundtriptest" + 
     (usemtls ? "" : " " + username + " " + password)
-  
+  let amqp;
+
   before(function () {
     if (backends.includes("http") && username.includes("http")) {
       reset()
@@ -55,43 +56,28 @@ describe('Having AMQP 1.0 protocol enabled and the following auth_backends: ' +
   })
 
   it('can open an AMQP 1.0 connection', async function () {     
-    connection = container.connect(
-      {'host': process.env.RABBITMQ_HOSTNAME || 'rabbitmq',
-       'port': process.env.RABBITMQ_AMQP_PORT || 5672,
-       'username' : process.env.RABBITMQ_AMQP_USERNAME || 'guest',
-       'password' : process.env.RABBITMQ_AMQP_PASSWORD || 'guest',
-       'id': "selenium-connection-id",
-       'container_id': "selenium-container-id",
-       'scheme': process.env.RABBITMQ_AMQP_SCHEME || 'amqp',
-       //enable_sasl_external:true,
-       
-      })
-    connection.open_receiver({
-      source: 'examples',
-      target: 'receiver-target',
-      name: 'receiver-link'
-    })
-    sender = connection.open_sender({
-      target: 'examples',
-      source: 'sender-source',
-      name: 'sender-link'
-    })
+    amqp = openAmqp()
     await untilConnectionEstablished
     var untilMessageReceived = new Promise((resolve, reject) => {
-      container.on('message', function(context) {
+      onAmqp('message', function(context) {
         resolve()
       })
     })
-    sender.send({body:'second message'})    
+    amqp.sender.send({body:'second message'})    
     await untilMessageReceived
     assert.equal(2, receivedAmqpMessageCount)
 
     //console.log(execSync(amqpClientCommand).toString())
   })
 
   after(function () {
-      if ( backends.includes("http") ) {
-        verifyAll(expectations)
-      }
+    if ( backends.includes("http") ) {
+      verifyAll(expectations)
+    }
+    try {
+      closeAmqp(amqp.connection)
+    } catch (error) {
+      console.error("Failed to close amqp10 connection due to " + error);      
+    }  
   })
 })

selenium/test/connections/amqp10/sessions-for-monitoring-user.js

@@ -1,25 +1,25 @@
 const { By, Key, until, Builder } = require('selenium-webdriver')
 require('chromedriver')
 const assert = require('assert')
+const { open: openAmqp, once: onceAmqp, on: onAmqp, close: closeAmqp } = require('../../amqp')
 const { buildDriver, goToHome, captureScreensFor, teardown, delay } = require('../../utils')
 
 const LoginPage = require('../../pageobjects/LoginPage')
 const OverviewPage = require('../../pageobjects/OverviewPage')
 const ConnectionsPage = require('../../pageobjects/ConnectionsPage')
 const ConnectionPage = require('../../pageobjects/ConnectionPage')
 
-var container = require('rhea')  // https://github.com/amqp/rhea
 var receivedAmqpMessageCount = 0
 var untilConnectionEstablished = new Promise((resolve, reject) => {
-  container.on('connection_open', function(context) {
+  onAmqp('connection_open', function(context) {
     resolve()
   })
 })
 
-container.on('message', function (context) {
+onAmqp('message', function (context) {
     receivedAmqpMessageCount++
 })
-container.once('sendable', function (context) {
+onceAmqp('sendable', function (context) {
     context.sender.send({body:'first message'})    
 })
 
@@ -28,7 +28,7 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function
   let captureScreen
   let connectionsPage
   let connectionPage
-  let connection 
+  let amqp 
 
   before(async function () {
     driver = buildDriver()
@@ -41,24 +41,8 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function
     await login.login('monitoring-only', 'guest')
     await overview.isLoaded()
 
-    connection = container.connect(
-      {'host': process.env.RABBITMQ_HOSTNAME || 'rabbitmq',
-       'port': process.env.RABBITMQ_AMQP_PORT || 5672,
-       'username' : process.env.RABBITMQ_AMQP_USERNAME || 'guest',
-       'password' : process.env.RABBITMQ_AMQP_PASSWORD || 'guest',
-       'id': "selenium-connection-id",
-       'container_id': "selenium-container-id"
-      })
-    connection.open_receiver({
-      source: 'examples',
-      target: 'receiver-target',
-      name: 'receiver-link'
-    })
-    sender = connection.open_sender({
-      target: 'examples',
-      source: 'sender-source',
-      name: 'sender-link'
-    })
+
+    amqp = openAmqp()    
     await untilConnectionEstablished
     await overview.clickOnConnectionsTab()    
     await connectionsPage.isLoaded()
@@ -108,11 +92,11 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function
 
   it('display live link information', async function () {
     var untilMessageReceived = new Promise((resolve, reject) => {
-      container.on('message', function(context) {
+      onAmqp('message', function(context) {
         resolve()
       })
     })
-    sender.send({body:'second message'})    
+    amqp.sender.send({body:'second message'})    
     await untilMessageReceived
     assert.equal(2, receivedAmqpMessageCount)
 
@@ -121,17 +105,13 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function
     let incomingLink = connectionPage.getIncomingLinkInfo(sessions.incoming_links, 0)
     assert.equal(2, incomingLink.deliveryCount)
 
-    //console.log("incomingLink: " + JSON.stringify(incomingLink))
-    //console.log("outgoingLink: " + JSON.stringify(outgoingLink))
   }) 
 
 
   after(async function () {    
     await teardown(driver, this, captureScreen)
     try {
-      if (connection != null) {
-        connection.close()
-      }
+      closeAmqp(amqp.connection)
     } catch (error) {
       console.error("Failed to close amqp10 connection due to " + error);      
     }