Fixes

asbestos-view/src/components/testRunner/AssertionReferences.vue

@@ -252,10 +252,15 @@
  if (tcMhdVersion !== undefined) {
  // console.debug(tcObj[0].mhdVersion)
  const mhdVersionSpecificDocBase = this.$store.state.testRunner.testAssertions.docBase[tcMhdVersion]
- // console.debug(mhdVersionSpecificDocBase)
- const re = new RegExp(`^${currentMhdUrlBase}`, 'i') // ^start line, {pattern}
- if (linkUrl.match(re) !== null) {
- return linkUrl.replace(re, mhdVersionSpecificDocBase)
+ const fixedDocLink = '.pdf'
+ if (! mhdVersionSpecificDocBase.endsWith(fixedDocLink)) {
+ // console.debug(mhdVersionSpecificDocBase)
+ const re = new RegExp(`^${currentMhdUrlBase}`, 'i') // ^start line, {pattern}
+ if (linkUrl.match(re) !== null) {
+ return linkUrl.replace(re, mhdVersionSpecificDocBase)
+ }
+ } else {
+ return mhdVersionSpecificDocBase
  }
  }
  }
@@ -265,12 +270,19 @@
  const currentTcName = this.$store.state.testRunner.currentTestCollectionName
  let tcCollectionObjs = null
  try {
- if (this.$store.state.testRunner.isClientTest) {
- tcCollectionObjs = this.$store.state.testRunner.clientTestCollectionObjs
+ // Are assertions being run from Inspector?
+ const pdbValTcIndex = this.$store.state.channel.pdbAssertions.indexOf(currentTcName)
+ if (pdbValTcIndex > -1) {
+ return this.$store.state.channel.mhdVersions[pdbValTcIndex]
  } else {
- tcCollectionObjs = this.$store.state.testRunner.serverTestCollectionObjs
+ // Conformance test area: client or server?
+ if (this.$store.state.testRunner.isClientTest) {
+ tcCollectionObjs = this.$store.state.testRunner.clientTestCollectionObjs
+ } else {
+ tcCollectionObjs = this.$store.state.testRunner.serverTestCollectionObjs
+ }
+ return tcCollectionObjs.filter(e => e.name === currentTcName)[0].mhdVersion
  }
- return tcCollectionObjs.filter(e => e.name === currentTcName)[0].mhdVersion
  } catch (e) {
  console.error('getTcMhdVersion error ' + e)
  }

asbestos-view/src/store/channel.js

@@ -12,14 +12,18 @@ export const channelStore = {
  'fhir',
  'mhd'
  ],
+ // The mhdVersions array index is linked to pdbAssertions array index.
+ // You must update the pdbAssertions array if mhdVersions array was updated.
+ // See also assertions.json docBase URLs.
  mhdVersions: [
  'MHDv3.x',
  'MHDv4',
  'MHDv410'
  ],
  pdbAssertions: [
  'Internal',
- 'MHDv4_Internal'
+ 'MHDv4_Internal',
+ 'MHDv410_Internal'
  ]
  }
  }

asbestos-war/src/main/webapp/data/TestAssertions/assertions.json

@@ -478,7 +478,7 @@
  "Bundle.meta.profile": {
  "SpecificationText": [{
  "text": "The FHIR Bundle.meta.profile shall have the following value depending on the Actor implementation of no options (Minimal Metadata), Comprehensive Metadata Option, or UnContained References Option...",
- "comments": "<span>1:33.2.3 UnContained Reference Option</span><br>https://profiles.ihe.net/ITI/MHD/1332_actor_options.html#13323-uncontained-reference-option<br>The UnContained Reference Option is not compatible with the XDS on FHIR Option. A system may be able to support both options, but only one will be able to be used at a given deployment.<br>UnContained References Option is not yet supported in Toolkit."
+ "comments": "<span>According to MHD, no options (Minimal Metadata) means there is no Profile present to validate against, and the submission is treated as Minimal Metadata.</span><br><span>1:33.2.3 UnContained Reference Option</span><br>https://profiles.ihe.net/ITI/MHD/1332_actor_options.html#13323-uncontained-reference-option<br>The UnContained Reference Option is not compatible with the XDS on FHIR Option. A system may be able to support both options, but only one will be able to be used at a given deployment.<br>UnContained References Option is not yet supported in Toolkit."
  }]
  }
  }