Skip to content

Fix merge error in release branch #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samuelraeburn merged 1 commit into from
Nov 9, 2021
Merged

Fix merge error in release branch #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions test/nodejs/test_rticonnextdds_connector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,41 +138,6 @@ describe('Connector Tests', function () {
await connector.close()
})

it('is possible to obtain the current version of Connector', function () {
const version = rti.Connector.getVersion()
expect(version).to.be.a.string

// The returned version string should contain four pieces of information:
// - the API version of Connector
// - the build ID of core.1.0
// - the build ID of dds_c.1.0
// - the build ID of lua_binding.1.0
// 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/
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/
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/
expect(regex.test(version)).deep.equals(true)
})

// Test for CON-200
it('Connector should not segfault if deleted twice', async function () {
const xmlProfile1 = path.join(__dirname, '/../xml/TestConnector.xml')
const xmlProfile2 = path.join(__dirname, '/../xml/TestConnector2.xml')
const fullXmlPath = xmlProfile1 + ';' + xmlProfile2
const connector = new rti.Connector('MyParticipantLibrary2::MyParticipant2', fullXmlPath)
expect(connector).to.exist
expect(connector).to.be.instanceOf(rti.Connector)
await connector.close()
await connector.close()
})

describe('Connector callback test', function () {
let connector

Expand Down
⚡