hqmf2js 1.3.0 → 1.4.0

data/test/test_helper.rb

@@ -1,6 +1,5 @@
-require_relative "./simplecov"
-require 'test/unit'
-require 'turn'
+require_relative "./simplecov_init"
+require 'minitest/autorun'
 
 if RUBY_PLATFORM=='java'
   require 'rhino'

data/test/unit/cmd_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'hquery-patient-api'
 
-class CmdTest < Test::Unit::TestCase
+class CmdTest < Minitest::Test
   
   def setup
     @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
@@ -27,44 +27,46 @@ class CmdTest < Test::Unit::TestCase
     ebs =  @context.eval(%{ var ebs =  new hQuery.Fulfillment({"dispenseDate": #{Time.utc(2009,02,02).to_i} , "quantityDispensed" : {"value" :"30"}}) })
     ece =  @context.eval(%{ var ece = new hQuery.Fulfillment({"dispenseDate": #{Time.utc(2010,12,21).to_i} , "quantityDispensed" : {"value" :"30"}}) })
     
-    assert_equal 10 , @context.eval("during.daysInRange(range,   perDay)"), "Should be 10 days during"
-    assert_equal 10 ,  @context.eval("scs.daysInRange(range,   perDay)"), "Should be 10 days starting concurrent with the start range"
-    assert_equal  3, @context.eval("sbs.daysInRange(range,   perDay)"), "Should be 4 days overlap for starting before the start of the range"
-    assert_equal  0, @context.eval("sae.daysInRange(range,  perDay)"), "Should be 0 days starting after end"
-    assert_equal  6, @context.eval("eae.daysInRange(range,  perDay)"), "Should be 6 days overlap ending after the end of date range"
-    assert_equal  0, @context.eval("ebs.daysInRange(range,  perDay)"), "Should be 0 days  overlap ending before the start of the date range"
-    assert_equal  10, @context.eval("ece.daysInRange(range,   perDay)"), "Should be 10 days when ending concurrent with the end"
+    assert_equal 10 , @context.eval("during.daysInRange(range, 1,  perDay)"), "Should be 10 days during"
+    assert_equal 10 ,  @context.eval("scs.daysInRange(range,  1,  perDay)"), "Should be 10 days starting concurrent with the start range"
+    assert_equal  3, @context.eval("sbs.daysInRange(range,  1,  perDay)"), "Should be 4 days overlap for starting before the start of the range"
+    assert_equal  0, @context.eval("sae.daysInRange(range, 1,  perDay)"), "Should be 0 days starting after end"
+    assert_equal  6, @context.eval("eae.daysInRange(range, 1,  perDay)"), "Should be 6 days overlap ending after the end of date range"
+    assert_equal  0, @context.eval("ebs.daysInRange(range, 1,  perDay)"), "Should be 0 days  overlap ending before the start of the date range"
+    assert_equal  10, @context.eval("ece.daysInRange(range, 1,   perDay)"), "Should be 10 days when ending concurrent with the end"
 
     @context.eval("var perDay = 1/3;") #every 3 days
 
-    assert_equal 90 , @context.eval("during.daysInRange(range,   perDay)"), "Should be 10 days during"
-    assert_equal 90 , @context.eval("scs.daysInRange(range,   perDay)"), "Should be 10 days starting concurrent with the start range"
-    assert_equal  90-7,  @context.eval("sbs.daysInRange(range,   perDay)"), "Should be 4 days overlap for starting before the start of the range"
-    assert_equal  0,  @context.eval("sae.daysInRange(range,  perDay)"), "Should be 0 days starting after end"
-    assert_equal  6,  @context.eval("eae.daysInRange(range,  perDay)"), "Should be 6 days overlap starting after the end of date range"
-    assert_equal  0,  @context.eval("ebs.daysInRange(range,  perDay)"), "Should be 0 days  overlap ending before the start of the date range"
-    assert_equal  10, @context.eval("ece.daysInRange(range,   perDay)"), "Should be 10 days when ending concurrent with the end"
+    assert_equal 90 , @context.eval("during.daysInRange(range, 1,   perDay)"), "Should be 10 days during"
+    assert_equal 90 , @context.eval("scs.daysInRange(range, 1,   perDay)"), "Should be 10 days starting concurrent with the start range"
+    assert_equal  90-7,  @context.eval("sbs.daysInRange(range, 1,   perDay)"), "Should be 4 days overlap for starting before the start of the range"
+    assert_equal  0,  @context.eval("sae.daysInRange(range, 1,  perDay)"), "Should be 0 days starting after end"
+    assert_equal  6,  @context.eval("eae.daysInRange(range, 1,  perDay)"), "Should be 6 days overlap starting after the end of date range"
+    assert_equal  0,  @context.eval("ebs.daysInRange(range, 1,  perDay)"), "Should be 0 days  overlap ending before the start of the date range"
+    assert_equal  10, @context.eval("ece.daysInRange(range, 1,   perDay)"), "Should be 10 days when ending concurrent with the end"
 
     @context.eval("range = new IVL_TS(null, new TS('20101231'))")
-    assert_equal 90, @context.eval("during.daysInRange(range,   perDay)"), "Should be 90 when not supplied a start date"
+    assert_equal 90, @context.eval("during.daysInRange(range, 1,   perDay)"), "Should be 90 when not supplied a start date"
     
     @context.eval("range = new IVL_TS(new TS('20100301'), null)")
-    assert_equal 63, @context.eval("during.daysInRange(range,   perDay)"), "Should be 90 when not supplied an end date date"
+    assert_equal 63, @context.eval("during.daysInRange(range, 1,   perDay)"), "Should be 90 when not supplied an end date date"
     
   end
 
   def test_cumulativeMedicationDuration
     medication1 = %{
       {
+        "dose" : {"unit" : "mg", "value" : "5"},
         "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
         "fulfillmentHistory": [
-          {"dispenseDate": #{Time.utc(2010,01,01).to_i} , "quantityDispensed" : {"value" :"30"}}
+          {"dispenseDate": #{Time.utc(2010,01,01).to_i} , "quantityDispensed" : {"value" :"150", "unit" : "mg"}}
          ]
       }
     }
 
     medication2 = %{
         {
+          "dose" : {"unit" : "mg", "value" : "1"},
           "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
           "fulfillmentHistory": [
             {"dispenseDate": #{Time.utc(2010,01,01).to_i} , "quantityDispensed" : {"value" :"30"}},
@@ -75,6 +77,7 @@ class CmdTest < Test::Unit::TestCase
 
     no_history = %{
         {
+          "dose" : {"unit" : "mg", "value" : "5"},
           "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
           "fulfillmentHistory": []
         }
@@ -89,4 +92,127 @@ class CmdTest < Test::Unit::TestCase
   end
 
 
-end
+def test_fullfillment_based_cmd
+    medication1 = %{
+      {
+        "dose" : {"unit" : "mg", "value" : "5"},
+        "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
+        "fulfillmentHistory": [
+          {"dispenseDate": #{Time.utc(2010,01,01).to_i} , "quantityDispensed" : {"value" :"150", "unit" : "mg"}}
+         ]
+      }
+    }
+
+    medication2 = %{
+        {
+          "dose" : {"unit" : "mg", "value" : "1"},
+          "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
+          "fulfillmentHistory": [
+            {"dispenseDate": #{Time.utc(2010,01,01).to_i} , "quantityDispensed" : {"value" :"30"}},
+            {"dispenseDate": #{Time.utc(2010,10,01).to_i} , "quantityDispensed" : {"value" :"90"}}
+           ]
+        }
+      }
+
+    no_history = %{
+        {
+          "dose" : {"unit" : "mg", "value" : "5"},
+          "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
+          "fulfillmentHistory": []
+        }
+      }
+    @context.eval("var med = new hQuery.Medication(#{medication1})")
+    @context.eval("var med2 = new hQuery.Medication(#{medication2})")
+    @context.eval("var no_meds = new hQuery.Medication(#{no_history})")
+    @context.eval("var range = new IVL_TS(new TS('20100101'), new TS('20101231'))")
+    @context.eval("var cmd1 = new CMD([med],'fullfillment')")
+    @context.eval("var cmd2 = new CMD([med2],'fullfillment')")
+    @context.eval("var cmd3 = new CMD([no_meds],'fullfillment')")
+    assert_equal 10, @context.eval("cmd1.days_active(range.low,range.high).length"), "CMD should be 10"
+    assert_equal 40, @context.eval("cmd2.days_active(range.low,range.high).length"), "CMD should be 40"
+    assert_equal 0, @context.eval("cmd3.days_active(range.low,range.high).length"), "CMD should be 0"
+  end
+
+
+def test_order_based_cmd
+    medication1 = %{
+      {
+        "dose" : {"unit" : "mg", "value" : "5"},
+        "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
+        "orderInformation": [
+          {"orderDateTime": #{Time.utc(2010,01,01).to_i} , "quantityOrdered" : {"value" :"150", "unit" : "mg"}, "fills": 2}
+         ]
+      }
+    }
+
+    medication2 = %{
+        {
+          "dose" : {"unit" : "mg", "value" : "1"},
+          "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
+          "orderInformation": [
+            {"orderDateTime": #{Time.utc(2010,01,01).to_i} , "quantityOrdered" : {"value" :"30"}},
+            {"orderDateTime": #{Time.utc(2010,10,01).to_i} , "quantityOrdered" : {"value" :"90"}}
+           ]
+        }
+      }
+
+    no_history = %{
+        {
+          "dose" : {"unit" : "mg", "value" : "5"},
+          "administrationTiming" :{'period' : {'unit': 'h' , 'value': 8 }},
+          "orderInformation": []
+        }
+      }
+    @context.eval("var med = new hQuery.Medication(#{medication1})")
+    @context.eval("var med2 = new hQuery.Medication(#{medication2})")
+    @context.eval("var no_meds = new hQuery.Medication(#{no_history})")
+    @context.eval("var range = new IVL_TS(new TS('20100101'), new TS('20101231'))")
+    @context.eval("var cmd1 = new CMD([med],'order')")
+    @context.eval("var cmd2 = new CMD([med2],'order')")
+    @context.eval("var cmd3 = new CMD([no_meds],'order')")
+    assert_equal 20, @context.eval("cmd1.days_active(range.low,range.high).length"), "CMD should be 10"
+    assert_equal 40, @context.eval("cmd2.days_active(range.low,range.high).length"), "CMD should be 40"
+    assert_equal 0, @context.eval("cmd3.days_active(range.low,range.high).length"), "CMD should be 0"
+  end
+
+  def test_active_days
+
+    @context.eval("var active = new ActiveDays()")
+    @context.eval("var ivl = new IVL_TS(new TS('20101001'), new TS('20101031'))")
+    @context.eval("active.add_ivlts(ivl)")
+    assert_equal 31, @context.eval("active.days_active(ivl.low,ivl.high).length")
+
+    @context.eval(" ivl = new IVL_TS(new TS('20101001'), new TS('20101010'))")
+    assert_equal 10, @context.eval("active.days_active(ivl.low,ivl.high).length")
+
+    @context.eval(" ivl = new IVL_TS(new TS('20101001'), new TS('20101110'))")
+    assert_equal 31, @context.eval("active.days_active(ivl.low,ivl.high).length")
+
+    @context.eval(" ivl = new IVL_TS(new TS('20101031'), new TS('20101110'))")
+    assert_equal 1, @context.eval("active.days_active(ivl.low,ivl.high).length")
+    
+    @context.eval(" ivl = new IVL_TS(new TS('20101110'), new TS('20110110'))")
+    @context.eval("active.add_ivlts(ivl)")
+
+    @context.eval(" ivl = new IVL_TS(new TS('20101031'), new TS('20101113'))")
+    assert_equal 5, @context.eval("active.days_active(ivl.low,ivl.high).length")
+    
+
+    @context.eval(" ivl = new IVL_TS(new TS('20101102'), new TS('20101113'))")
+    assert_equal 4, @context.eval("active.days_active(ivl.low,ivl.high).length")
+
+
+    @context.eval(" ivl = new IVL_TS(new TS('20100101'), new TS('20110113'))")
+    assert_equal 93, @context.eval("active.days_active(ivl.low,ivl.high).length")
+
+    @context.eval("ivl = new IVL_TS(new TS('20101110'), new TS('20110110'))")
+    @context.eval("active.add_ivlts(ivl)")
+
+    @context.eval(" ivl = new IVL_TS(new TS('20100101'), new TS('20110113'))")
+    assert_equal 93, @context.eval("active.days_active(ivl.low,ivl.high).length")
+
+
+
+  end
+
+end

data/test/unit/codes_to_json_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class CodesToJsonTest < Test::Unit::TestCase
+class CodesToJsonTest < Minitest::Test
   
   def setup
   end
@@ -14,9 +14,9 @@ class CodesToJsonTest < Test::Unit::TestCase
     
     @context = get_js_context("var dictionary = #{codes_json}")
     
-    @context.eval("dictionary").entries.length.must_equal 19
-    @context.eval("dictionary['2.16.840.1.113883.3.464.1.42']").entries.first[0].must_equal "CPT"
-    @context.eval("dictionary['2.16.840.1.113883.3.464.1.42']").entries.first[1].length.must_equal 19
+    assert_equal 19, @context.eval("dictionary").entries.length
+    assert_equal "CPT", @context.eval("dictionary['2.16.840.1.113883.3.464.1.42']").entries.first[0]
+    assert_equal 19, @context.eval("dictionary['2.16.840.1.113883.3.464.1.42']").entries.first[1].length
     
   end
 
@@ -24,13 +24,13 @@ class CodesToJsonTest < Test::Unit::TestCase
     value_sets = JSON.parse(File.read(File.join('test','fixtures','codes','codes.json'))).map {|vs| HealthDataStandards::SVS::ValueSet.new(vs)}
     oid_map = HQMF2JS::Generator::CodesToJson.from_value_sets(value_sets)
 
-    oid_map.keys.sort.must_equal ["1.2.3.4.5","1.2.3.4.6"]
-    oid_map["1.2.3.4.5"].keys.sort.must_equal ["ICD-9-CM","SNOMED-CT"]
-    oid_map["1.2.3.4.5"]["ICD-9-CM"].sort.must_equal ["126", "127"]
-    oid_map["1.2.3.4.5"]["SNOMED-CT"].sort.must_equal ["123", "124", "125"]
-    oid_map["1.2.3.4.6"].keys.sort.must_equal ["CPT","SNOMED-CT"]
-    oid_map["1.2.3.4.6"]["CPT"].sort.must_equal ["125C", "126D", "127E"]
-    oid_map["1.2.3.4.6"]["SNOMED-CT"].sort.must_equal ["123A", "124B"]
+    assert_equal ["1.2.3.4.5","1.2.3.4.6"], oid_map.keys.sort
+    assert_equal ["ICD-9-CM","SNOMED-CT"], oid_map["1.2.3.4.5"].keys.sort
+    assert_equal ["126", "127"], oid_map["1.2.3.4.5"]["ICD-9-CM"].sort
+    assert_equal ["123", "124", "125"], oid_map["1.2.3.4.5"]["SNOMED-CT"].sort
+    assert_equal ["CPT","SNOMED-CT"], oid_map["1.2.3.4.6"].keys.sort
+    assert_equal ["125C", "126D", "127E"], oid_map["1.2.3.4.6"]["CPT"].sort
+    assert_equal ["123A", "124B"], oid_map["1.2.3.4.6"]["SNOMED-CT"].sort
 
   # def self.from_value_sets(value_sets)
   #   # make sure we have a string keyed hash
@@ -53,4 +53,4 @@ class CodesToJsonTest < Test::Unit::TestCase
   end
 
 
-end
+end

data/test/unit/custom_calculations_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'hquery-patient-api'
 
-class CustomCalculationsTest < Test::Unit::TestCase
+class CustomCalculationsTest < Minitest::Test
   
   def setup
     @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
@@ -78,7 +78,7 @@ class CustomCalculationsTest < Test::Unit::TestCase
 
 
   def test_inr_results
-    @context.eval("typeof(hqmf.CustomCalc.PercentTTREntries) === 'function'").must_equal true
+    assert_equal true, @context.eval("typeof(hqmf.CustomCalc.PercentTTREntries) === 'function'")
     assert @context.eval("Math.abs(list.calculateDaysInRange(inr1,inr2) - 3.714285714285717) < .001")
     assert @context.eval("Math.abs(list.calculateDaysInRange(inr2,inr3)) == 0 ")
     assert @context.eval("Math.abs(list.calculateDaysInRange(inr3,inr4))  == 0")
@@ -93,10 +93,6 @@ class CustomCalculationsTest < Test::Unit::TestCase
     assert @context.eval("Math.abs(list.calculateDaysInRange(inr12,inr13) - 14) < .001")
     
   end
-  
-  def test_total_number_of_days
-    @context.eval("list.totalNumberOfDays()").must_equal 198
-  end
 
   def test_calculate_ttr
     assert @context.eval("Math.abs(list.calculateTTR() - 87.11113886) < .001")

data/test/unit/effective_date_test.rb

@@ -1,11 +1,10 @@
 require_relative '../test_helper'
 
-class EffectiveDateTest < Test::Unit::TestCase
+class EffectiveDateTest < Minitest::Test
   def setup
     # Open a path to all of our fixtures
-    hqmf_contents = File.open("test/fixtures/NQF59New.xml").read
-    
-    doc = HQMF::Parser.parse(hqmf_contents, HQMF::Parser::HQMF_VERSION_2)
+    model = JSON.parse(File.open("test/fixtures/NQF59New.json").read)
+    doc = HQMF::Document.from_json(model)
     
     # First compile the CoffeeScript that enables our converted HQMF JavaScript
     ctx = Sprockets::Environment.new(File.expand_path("../../..", __FILE__))

data/test/unit/erb_context_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class ErbContextTest < Test::Unit::TestCase
+class ErbContextTest < Minitest::Test
 
   def setup
   end
@@ -12,51 +12,51 @@ class ErbContextTest < Test::Unit::TestCase
     criteria = HQMF::DataCriteria.from_json(nil, JSON.parse(File.read(File.join('test','fixtures','json','data_criteria','temporals_with_anynonnull.json'))))
 
     get_codes = context.js_for_code_list(criteria)
-    get_codes.must_equal "getCodes(\"2.16.840.1.113883.3.117.1.7.1.23\")"
+    assert_equal "getCodes(\"2.16.840.1.113883.3.117.1.7.1.23\")", get_codes
     criteria.instance_variable_set(:@code_list_id, nil)
     get_codes = context.js_for_code_list(criteria)
-    get_codes.must_equal "null"
+    assert_equal "null", get_codes
 
     date_bound = context.js_for_date_bound(criteria)
-    date_bound.must_equal "MeasurePeriod.high.asDate()"
+    assert_equal "MeasurePeriod.high.asDate()", date_bound
 
     criteria.temporal_references[0].instance_variable_set(:@type,"FOO")
-    exception = assert_raise RuntimeError do
+    exception = assert_raises RuntimeError do
       context.js_for_date_bound(criteria)
     end
-    exception.message.must_equal "do not know how to get a date for this type"
+    assert_equal "do not know how to get a date for this type", exception.message 
   end  
 
   def test_value_js
     context = HQMF2JS::Generator::ErbContext.new({})
     value = HQMF::Value.from_json({"type" => "ANYNonNull"})
     result = context.js_for_value(value)
-    result.must_equal "new ANYNonNull()"
+    assert_equal "new ANYNonNull()", result 
 
     
     value = HQMF::Value.from_json({"type"=>"SCALAR", "unit"=>"mm[Hg]", "value"=>"90", "inclusive?"=>false, "derived?"=>false } ) 
     result = context.js_for_value(value)
-    result.must_equal "new SCALAR(90, \"mm[Hg]\", false)"
+    assert_equal "new SCALAR(90, \"mm[Hg]\", false)", result 
 
     value = HQMF::Value.from_json({"type"=>"SCALAR", "unit"=>nil, "value"=>"90", "inclusive?"=>true, "derived?"=>false } ) 
     result = context.js_for_value(value)
-    result.must_equal "new SCALAR(\"90\", null, true)"
+    assert_equal "new SCALAR(\"90\", null, true)", result
 
     value = HQMF::Value.from_json({"type"=>"SCALAR", "unit"=>nil, "value"=>"90", "inclusive?"=>nil, "derived?"=>false } )
     value.instance_variable_set(:@inclusive, nil)
     result = context.js_for_value(value)
-    result.must_equal "new SCALAR(\"90\")"
+    assert_equal "new SCALAR(\"90\")", result 
 
   end
 
   def test_field_library_method
     context = HQMF2JS::Generator::ErbContext.new({})
     result = context.field_library_method('ADMISSION_DATETIME')
-    result.must_equal "adjustBoundsForField"
+    assert_equal "adjustBoundsForField", result 
 
     context = HQMF2JS::Generator::ErbContext.new({})
     result = context.field_library_method('FACILITY_LOCATION_ARRIVAL_DATETIME')
-    result.must_equal "denormalizeEventsByLocation"
+    assert_equal "denormalizeEventsByLocation", result 
   end
 
   

data/test/unit/filter_by_reference_test.rb

@@ -0,0 +1,39 @@
+require_relative '../test_helper'
+require 'hquery-patient-api'
+
+class FilterByReferenceTest < Minitest::Test
+  
+  def setup
+    @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
+    @context.eval("hqmf.SpecificsManager.initialize()")
+  end
+
+  def test_filter
+    @context.eval "var evts = [new hQuery.CodedEntry({'_id' : 'id1', 'references' : [{'referenced_id' : 'id4', 'type' : 'fulfills'}]}),
+    new hQuery.CodedEntry({'_id' : 'id2','references' : [{'referenced_id' : 'id5', 'type' : 'some_reference'}]}),
+    new hQuery.CodedEntry({'_id' : 'id3'})]
+
+    var pos = [new hQuery.CodedEntry({'_id' : 'id4'}),
+    new hQuery.CodedEntry({'_id' : 'id5'}),
+    new hQuery.CodedEntry({'_id' : 'id6'})] 
+
+    "
+
+    assert_equal 1, @context.eval("filterEventsByReference(evts,'fulfills',pos).length")
+    assert_equal 'id1' , @context.eval("filterEventsByReference(evts,'fulfills',pos)[0].id")
+    assert_equal 1, @context.eval("filterEventsByReference(evts,'some_reference',pos).length")
+    assert_equal 'id2' , @context.eval("filterEventsByReference(evts,'some_reference',pos)[0].id")
+    assert_equal 0, @context.eval("filterEventsByReference(evts,'nonexistent_ref',pos).length")
+
+  end
+
+  def test_communicationFilter
+
+    @context.eval "var communication_evts = [new hQuery.Communication({ 'direction' : 'communication_from_patient_to_provider' })]
+
+    "
+
+    assert_equal 1, @context.eval("filterEventsByCommunicationDirection(communication_evts,'communication_from_patient_to_provider').length")
+    assert_equal 0, @context.eval("filterEventsByCommunicationDirection(communication_evts,'communication_from_provider_to_patient').length")
+  end
+end

data/test/unit/hqmf_from_json_javascript_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class HqmfFromJsonJavascriptTest < Test::Unit::TestCase
+class HqmfFromJsonJavascriptTest < Minitest::Test
   def setup
     json_measure = File.open("test/fixtures/json/59New.json").read
     measure_hash = JSON.parse(json_measure)
@@ -60,6 +60,7 @@ class HqmfFromJsonJavascriptTest < Test::Unit::TestCase
     assert !@context.eval("hqmfjs.dead3MonthsAfterMeasurePeriod(numeratorPatient).isTrue()")
     assert !@context.eval("hqmfjs.deadBetween5and6MonthsDuringMeasurePeriod(numeratorPatient).isTrue()")
     
+    @context.eval("numeratorPatient.json['expired']=true")
     @context.eval("numeratorPatient.json['deathdate']=#{Time.utc(2010,11).to_i}")
     assert !@context.eval("hqmfjs.dead3MonthsBeforeMeasurePeriod(numeratorPatient).isTrue()")
     assert !@context.eval("hqmfjs.dead3MonthsAfterMeasurePeriod(numeratorPatient).isTrue()")

data/test/unit/hqmf_javascript_test.rb

@@ -1,13 +1,12 @@
 require_relative '../test_helper'
 require 'hquery-patient-api'
 
-class HqmfJavascriptTest < Test::Unit::TestCase
+class HqmfJavascriptTest < Minitest::Test
   def setup
     # Open a path to all of our fixtures
-    hqmf_contents = File.open("test/fixtures/NQF59New.xml").read
-    
-    doc = HQMF::Parser.parse(hqmf_contents, HQMF::Parser::HQMF_VERSION_2)
-    
+    model = JSON.parse(File.open("test/fixtures/NQF59New.json").read)
+    doc = HQMF::Document.from_json(model)
+
     codes_file_path = File.expand_path("../../fixtures/codes/codes.xml", __FILE__)
     
     # First compile the CoffeeScript that enables our converted HQMF JavaScript
@@ -49,11 +48,11 @@ class HqmfJavascriptTest < Test::Unit::TestCase
     local_context.eval("#{hqmf_utils}
                         #{value}")
                         
-    local_context.eval('typeof hqmfjs != undefined').must_equal true
-    local_context.eval('typeof OidDictionary != undefined').must_equal true
-    local_context.eval('typeof hqmfjs.IPP != undefined').must_equal true
-    local_context.eval('typeof hqmfjs.NUMER != undefined').must_equal true
-    local_context.eval('typeof hqmfjs.DENOM != undefined').must_equal true
+    assert_equal true, local_context.eval('typeof hqmfjs != undefined')
+    assert_equal true, local_context.eval('typeof OidDictionary != undefined')
+    assert_equal true, local_context.eval('typeof hqmfjs.IPP != undefined')
+    assert_equal true, local_context.eval('typeof hqmfjs.NUMER != undefined')
+    assert_equal true, local_context.eval('typeof hqmfjs.DENOM != undefined')
   end
 
   def test_to_js_method_without_codes
@@ -185,8 +184,8 @@ class HqmfJavascriptTest < Test::Unit::TestCase
   end
   
   def test_map_reduce_generation
-    hqmf_contents = File.open("test/fixtures/NQF59New.xml").read
-    doc = HQMF::Parser.parse(hqmf_contents, HQMF::Parser::HQMF_VERSION_2)
+    model = JSON.parse(File.open("test/fixtures/NQF59New.json").read)
+    doc = HQMF::Document.from_json(model)
     
     map_reduce = HQMF2JS::Converter.generate_map_reduce(doc)
     
@@ -206,7 +205,7 @@ class HqmfJavascriptTest < Test::Unit::TestCase
     context = HQMF2JS::Generator::ErbContext.new({})
     criteria = HQMF::DataCriteria.new(nil,nil,nil,nil,nil,nil,nil,'patient_characteristic',nil,nil,nil,nil,nil,nil,nil,nil,nil,nil,nil)
     
-    exception = assert_raise RuntimeError do
+    exception = assert_raises RuntimeError do
       n = context.js_name(criteria)
     end
     assert exception.message.match(/^No identifier for .*/)