R4

.gitignore

@@ -11,6 +11,7 @@ ctl/*
 /test/tmp/
 /test/version_tmp/
 /test/unit/coverage
+/test/coverage
 /tmp/
 
 ## Specific to RubyMotion:

Gemfile.lock

@@ -7,6 +7,7 @@ PATH
       fhir_client
       fhir_dstu2_models
       fhir_models
+      fhir_stu3_models
       jsonpath
       nokogiri (>= 1.8.2)
       nokogiri-diff
@@ -16,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,7 +29,9 @@ GEM
     bcp47 (0.3.3)
       i18n
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
+    coolline (0.5.0)
+      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     date_time_precision (0.8.1)
@@ -37,45 +40,53 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    fhir_client (3.1.2)
+    fhir_client (4.0.0)
       activesupport (>= 3)
       addressable (>= 2.3)
-      fhir_dstu2_models (>= 1.0.4)
-      fhir_models (>= 3.0.3)
+      fhir_dstu2_models (>= 1.0.9)
+      fhir_models (>= 4.0.0)
+      fhir_stu3_models (>= 3.0.0)
       nokogiri (>= 1.8.2)
       oauth2 (~> 1.1)
       rack (>= 1.5)
       rest-client (~> 2.0)
       tilt (>= 1.1)
-    fhir_dstu2_models (1.0.7)
+    fhir_dstu2_models (1.0.10)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
-      mime-types (>= 1.16, < 3)
-      nokogiri (>= 1.8.2)
-    fhir_models (3.0.3)
+      mime-types (>= 3.0)
+      nokogiri (>= 1.10.4)
+    fhir_models (4.0.2)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
-      mime-types (>= 1.16, < 3)
-      nokogiri (>= 1.8.2)
+      mime-types (>= 3.0)
+      nokogiri (>= 1.10.4)
+    fhir_stu3_models (3.0.1)
+      bcp47 (>= 0.3)
+      date_time_precision (>= 0.8)
+      mime-types (>= 3.0)
+      nokogiri (>= 1.10.4)
     hashdiff (0.3.8)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json (2.2.0)
     jsonpath (1.0.1)
       multi_json
       to_regexp (~> 0.2.1)
     jwt (2.1.0)
     method_source (0.9.2)
-    mime-types (2.99.3)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogiri-diff (0.2.0)
       nokogiri (~> 1.5)
@@ -90,6 +101,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    pry-coolline (0.2.5)
+      coolline (~> 0.5)
     public_suffix (3.0.3)
     rack (2.0.8)
     rake (12.3.3)
@@ -113,7 +126,8 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
+    unicode_utils (1.4.0)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -127,6 +141,7 @@ DEPENDENCIES
   awesome_print
   plan_executor!
   pry
+  pry-coolline
   rake
   simplecov
   test-unit

README.md

@@ -1,10 +1,8 @@
 # Plan Executor [![Build Status](https://travis-ci.org/fhir-crucible/plan_executor.svg?branch=master)](https://travis-ci.org/fhir-crucible/plan_executor)
 
-Plan Executor runs test suites against a FHIR server.
-
-# STU3
-
-Updated to support the FHIR [STU3 Candidate branch](http://hl7.org/fhir/2016May/index.html).
+Plan Executor runs test suites against a FHIR server. It supports `DSTU2`, `STU3` and `R4` versions of FHIR.
+Tests can either be written in [Ruby](https://github.com/fhir-crucible/plan_executor#adding-a-new-test-suite),
+or using the [TestScript Resource](https://github.com/fhir-crucible/plan_executor/wiki/Using-Plan-Executor-with-TestScripts#testscript).
 
 ## Getting Started
 
@@ -15,7 +13,7 @@ $ bundle exec rake -T
 
 ## Listing Test Suites
 
-List all the available Test Suites, excluding supported `TestScripts`. Pass the version, which can currently either be `dstu2` or `stu3`.
+List all the available Test Suites, excluding supported `TestScripts`. Pass the version, which can currently be `dstu2`, `stu3` or `r4`.
 
 ```
 $ bundle exec rake crucible:list_suites[dstu2]
@@ -26,18 +24,23 @@ $ bundle exec rake crucible:list_suites[dstu2]
 Crucible tests can be executed by suite from the command-line by calling the `crucible-execute` rake task with the following parameters:
 
 * `url` the FHIR endpoint
-* `version` the FHIR version (sequence).  Currently `dstu2` and `stu3` are supported.
+* `version` the FHIR version (sequence).  Currently `dstu2`, `stu3` and `r4` are supported.
 * `test` the name of the test suite (see `crucible:list_suites`)
 * `resource` (optional) limit the `test` (applicable to "ResourceTest" or "SearchTest" suites) to a given resource (e.g. "Patient")
 
-Run a DSTU2 Suite
+Run a R4 Suite limited by Resource
 ```
-$ bundle exec rake crucible:execute[http://fhirtest.uhn.ca/baseDstu2,dstu2,TransactionAndBatchTest]
+$ bundle exec rake crucible:execute[http://hapi.fhir.org/r4,r4,ResourceTest,Patient]
 ```
 
 Run a STU3 Suite limited by Resource
 ```
-$ bundle exec rake crucible:execute[http://fhirtest.uhn.ca/baseDstu3,stu3,ResourceTest,Patient]
+$ bundle exec rake crucible:execute[http://hapi.fhir.org/baseDstu3,stu3,ResourceTest,Patient]
+```
+
+Run a DSTU2 Suite
+```
+$ bundle exec rake crucible:execute[http://hapi.fhir.org/baseDstu2,dstu2,TransactionAndBatchTest]
 ```
 
 ## Adding a New Test Suite
@@ -113,7 +116,7 @@ a trail of test data behind.
 
 # License
 
-Copyright 2014-2016 The MITRE Corporation
+Copyright 2014-2020 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.