Add more test cases for offset / count

tx/messages-tx.fhir.org.json

@@ -127,8 +127,8 @@
     "1" : "Found a circularity pointing to http://hl7.org/fhir/test/ValueSet/big-circle-1|5.0.0 processing ValueSet with pathway [http://hl7.org/fhir/test/ValueSet/big-circle-1|5.0.0, http://hl7.org/fhir/test/ValueSet/big-circle-2|5.0.0]"
   },
   "big/expand-no-limit-outcome.json" : {
-    "1" : "The value set http://hl7.org/fhir/test/ValueSet/big has too many codes to display (>1000)",
-    "2" : "The expansion of value set http://hl7.org/fhir/test/ValueSet/big was too big (>1000)"
+    "1" : "The value set 'http://hl7.org/fhir/test/ValueSet/big|5.0.0' expansion has 2000 codes, which is too many to display (>1000)",
+    "2" : "The value set 'http://hl7.org/fhir/test/ValueSet/big|5.0.0' expansion has 2000 codes, which is too many to display (>1000)"
   },
   "validation/simple-code-bad-valueSet-response-outcome.json" : {
     "1" : "A definition for the value Set 'http://hl7.org/fhir/test/ValueSet/simple-allX' could not be found"

tx/simple/simple-expand-isa-c2-request-parameters.json

@@ -0,0 +1,13 @@
+{
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "url",
+    "valueUrl" : "http://hl7.org/fhir/test/ValueSet/simple-filter-isa"
+  },{
+    "name" : "excludeNested",
+    "valueBoolean" : true
+  },{
+    "name" : "count",
+    "valueInteger" : 2
+  }]
+}

tx/simple/simple-expand-isa-c2-response-valueSet.json

@@ -0,0 +1,56 @@
+{
+  "$optional-properties$" : ["date", "publisher", "compose"],
+  "resourceType" : "ValueSet",
+  "url" : "http://hl7.org/fhir/test/ValueSet/simple-filter-isa",
+  "version" : "5.0.0",
+  "name" : "SimpleValueSetFilterIsA",
+  "title" : "Simple ValueSet Filter by Is-A",
+  "status" : "active",
+  "experimental" : false,
+  "date" : "2023-04-01",
+  "publisher" : "FHIR Project",
+  "compose" : {
+    "include" : [{
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "filter" : [{
+        "property" : "concept",
+        "op" : "is-a",
+        "value" : "code2"
+      }]
+    }]
+  },
+  "expansion" : {
+    "identifier" : "$uuid$",
+    "timestamp" : "$instant$",
+    "total" : 5,
+    "parameter" : [{
+      "name" : "count",
+      "valueInteger" : 2
+    },
+    {
+      "name" : "excludeNested",
+      "valueBoolean" : true
+    },
+    {
+      "name" : "used-codesystem",
+      "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
+    },
+    {
+      "$optional$" : true,
+      "name" : "version",
+      "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
+    }],
+    "contains" : [{
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "abstract" : true,
+      "inactive" : true,
+      "code" : "code2",
+      "display" : "Display 2"
+    },
+    {
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "code" : "code2a",
+      "display" : "Display 2a"
+    }]
+  }
+}

tx/simple/simple-expand-isa-o2-request-parameters.json

@@ -0,0 +1,13 @@
+{
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "url",
+    "valueUrl" : "http://hl7.org/fhir/test/ValueSet/simple-filter-isa"
+  },{
+    "name" : "excludeNested",
+    "valueBoolean" : true
+  },{
+    "name" : "offset",
+    "valueInteger" : 2
+  }]
+}

tx/simple/simple-expand-isa-o2-response-valueSet.json

@@ -0,0 +1,60 @@
+{
+  "$optional-properties$" : ["date", "publisher", "compose"],
+  "resourceType" : "ValueSet",
+  "url" : "http://hl7.org/fhir/test/ValueSet/simple-filter-isa",
+  "version" : "5.0.0",
+  "name" : "SimpleValueSetFilterIsA",
+  "title" : "Simple ValueSet Filter by Is-A",
+  "status" : "active",
+  "experimental" : false,
+  "date" : "2023-04-01",
+  "publisher" : "FHIR Project",
+  "compose" : {
+    "include" : [{
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "filter" : [{
+        "property" : "concept",
+        "op" : "is-a",
+        "value" : "code2"
+      }]
+    }]
+  },
+  "expansion" : {
+    "identifier" : "$uuid$",
+    "timestamp" : "$instant$",
+    "total" : 5,
+    "offset" : 2,
+    "parameter" : [{
+      "name" : "excludeNested",
+      "valueBoolean" : true
+    },
+    {
+      "name" : "offset",
+      "valueInteger" : 2
+    },
+    {
+      "name" : "used-codesystem",
+      "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
+    },
+    {
+      "$optional$" : true,
+      "name" : "version",
+      "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
+    }],
+    "contains" : [{
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "code" : "code2aI",
+      "display" : "Display 2aI"
+    },
+    {
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "code" : "code2aII",
+      "display" : "Display 2aII"
+    },
+    {
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "code" : "code2b",
+      "display" : "Display 2b"
+    }]
+  }
+}

tx/simple/simple-expand-isa-o2c2-request-parameters.json

@@ -0,0 +1,16 @@
+{
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "url",
+    "valueUrl" : "http://hl7.org/fhir/test/ValueSet/simple-filter-isa"
+  },{
+    "name" : "excludeNested",
+    "valueBoolean" : true
+  },{
+    "name" : "offset",
+    "valueInteger" : 2
+  },{
+    "name" : "count",
+    "valueInteger" : 2
+  }]
+}

tx/simple/simple-expand-isa-o2c2-response-valueSet.json

@@ -0,0 +1,59 @@
+{
+  "$optional-properties$" : ["date", "publisher", "compose"],
+  "resourceType" : "ValueSet",
+  "url" : "http://hl7.org/fhir/test/ValueSet/simple-filter-isa",
+  "version" : "5.0.0",
+  "name" : "SimpleValueSetFilterIsA",
+  "title" : "Simple ValueSet Filter by Is-A",
+  "status" : "active",
+  "experimental" : false,
+  "date" : "2023-04-01",
+  "publisher" : "FHIR Project",
+  "compose" : {
+    "include" : [{
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "filter" : [{
+        "property" : "concept",
+        "op" : "is-a",
+        "value" : "code2"
+      }]
+    }]
+  },
+  "expansion" : {
+    "identifier" : "$uuid$",
+    "timestamp" : "$instant$",
+    "total" : 5,
+    "offset" : 2,
+    "parameter" : [{
+      "name" : "count",
+      "valueInteger" : 2
+    },
+    {
+      "name" : "excludeNested",
+      "valueBoolean" : true
+    },
+    {
+      "name" : "offset",
+      "valueInteger" : 2
+    },
+    {
+      "name" : "used-codesystem",
+      "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
+    },
+    {
+      "$optional$" : true,
+      "name" : "version",
+      "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
+    }],
+    "contains" : [{
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "code" : "code2aI",
+      "display" : "Display 2aI"
+    },
+    {
+      "system" : "http://hl7.org/fhir/test/CodeSystem/simple",
+      "code" : "code2aII",
+      "display" : "Display 2aII"
+    }]
+  }
+}

tx/test-cases.json

@@ -25,6 +25,21 @@
         "operation" : "expand",
         "request" : "simple/simple-expand-isa-request-parameters.json",
         "response" : "simple/simple-expand-isa-response-valueSet.json"
+      },{
+        "name" : "simple-expand-isa-o2",
+        "operation" : "expand",
+        "request" : "simple/simple-expand-isa-o2-request-parameters.json",
+        "response" : "simple/simple-expand-isa-o2-response-valueSet.json"
+      },{
+        "name" : "simple-expand-isa-c2",
+        "operation" : "expand",
+        "request" : "simple/simple-expand-isa-c2-request-parameters.json",
+        "response" : "simple/simple-expand-isa-c2-response-valueSet.json"
+      },{
+        "name" : "simple-expand-isa-o2c2",
+        "operation" : "expand",
+        "request" : "simple/simple-expand-isa-o2c2-request-parameters.json",
+        "response" : "simple/simple-expand-isa-o2c2-response-valueSet.json"
       },{
         "name" : "simple-expand-prop",
         "operation" : "expand",