Feature/hmaint 235 (#76)

* HMAINT-235: Handle case where build ID has 4 integers

* HMAINT-235: Fix unrelated commented out test

(cherry picked from commit 2ae9702)

Author: samuelraeburn

test/nodejs/test_rticonnextdds_connector.js

@@ -93,15 +93,15 @@ describe('Connector Tests', function () {
     await connector.close()
   })
 
-//   it('Should be possible to create a Connector with participant qos', async function () {
-//     const xmlProfile = path.join(__dirname, '/../xml/TestConnector.xml')
-//     const connector = new rti.Connector(
-//       'MyParticipantLibrary::ConnectorWithParticipantQos',
-//       xmlProfile)
-//     expect(connector).to.exist
-//     expect(connector).to.be.instanceOf(rti.Connector)
-//     await connector.close()
-//   })
+  it('Should be possible to create a Connector with participant qos', async function () {
+    const xmlProfile = path.join(__dirname, '/../xml/TestConnector.xml')
+    const connector = new rti.Connector(
+      'MyParticipantLibrary::ConnectorWithParticipantQos',
+      xmlProfile)
+    expect(connector).to.exist
+    expect(connector).to.be.instanceOf(rti.Connector)
+    await connector.close()
+  })
 
   it('is possible to obtain the current version of Connector', function () {
     const version = rti.Connector.getVersion()
@@ -112,17 +112,18 @@ describe('Connector Tests', function () {
     // - the build ID of core.1.0
     // - the build ID of dds_c.1.0
     // - the build ID of lua_binding.1.0
+    // Each build ID has either 3 or 4 version digits.
     // Expect "RTI Connector for JavaScript, version X.X.X"
     let regex = /RTI Connector for JavaScript, version ([0-9][.]){2}[0-9]/
     expect(regex.test(version)).deep.equals(true)
     // Expect "NDDSCORE_BUILD_<VERSION>_<DATE>T<TIMESTAMP>Z"
-    regex = /.*NDDSCORE_BUILD_([0-9][.]){2}[0-9]_[0-9]{8}T[0-9]{6}Z/
+    regex = /.*NDDSCORE_BUILD_([0-9][.]){2,3}[0-9]_[0-9]{8}T[0-9]{6}Z/
     expect(regex.test(version)).deep.equals(true)
     // Expect "NDDSC_BUILD_<VERSION>_<DATE>T<TIMESTAMP>Z"
-    regex = /.*NDDSC_BUILD_([0-9][.]){2}[0-9]_[0-9]{8}T[0-9]{6}Z/
+    regex = /.*NDDSC_BUILD_([0-9][.]){2,3}[0-9]_[0-9]{8}T[0-9]{6}Z/
     expect(regex.test(version)).deep.equals(true)
     // Expect "RTICONNECTOR_BUILD_<VERSION>_<DATE>T<TIMESTAMP>Z"
-    regex = /.*RTICONNECTOR_BUILD_([0-9][.]){2}[0-9]_[0-9]{8}T[0-9]{6}Z/
+    regex = /.*RTICONNECTOR_BUILD_([0-9][.]){2,3}[0-9]_[0-9]{8}T[0-9]{6}Z/
     expect(regex.test(version)).deep.equals(true)
   })
 

test/xml/TestConnector.xml

@@ -309,7 +309,17 @@ This code contains trade secrets of Real-Time Innovations, Inc.
         <!-- Test for CON-214 -->
         <domain_participant name="ConnectorWithParticipantQos"
                             domain_ref="MyDomainLibrary::MyDomain">
-            <domain_participant_qos/>
+            <domain_participant_qos>
+                <transport_builtin>
+                    <mask>UDPV4 | SHMEM</mask>
+                </transport_builtin>
+                <database>
+                    <shutdown_cleanup_period>
+                        <sec>0</sec>
+                        <nanosec>100000000</nanosec>
+                    </shutdown_cleanup_period>
+                </database>
+            </domain_participant_qos>
         </domain_participant>
     </domain_participant_library>
 </dds>